diff --git a/react/features/lobby/components/web/LobbySection.js b/react/features/lobby/components/web/LobbySection.js
index d1d1fe0b9..64a66359e 100644
--- a/react/features/lobby/components/web/LobbySection.js
+++ b/react/features/lobby/components/web/LobbySection.js
@@ -59,18 +59,19 @@ class LobbySection extends PureComponent<Props, State> {
     }
 
     /**
-     * Implements {@code PureComponent#componentDidUpdate}.
+     * Implements React's {@link Component#getDerivedStateFromProps()}.
      *
      * @inheritdoc
      */
-    componentDidUpdate(prevProps, prevState) {
-        if (this.props._lobbyEnabled !== prevProps._lobbyEnabled
-                && this.state.lobbyEnabled !== prevState.lobbyEnabled) {
-            // eslint-disable-next-line react/no-did-update-set-state
-            this.setState({
-                lobbyEnabled: this.props._lobbyEnabled
-            });
+    static getDerivedStateFromProps(props: Props, state: Object) {
+        if (props._lobbyEnabled !== state.lobbyEnabled) {
+
+            return {
+                lobbyEnabled: props._lobbyEnabled
+            };
         }
+
+        return null;
     }
 
     /**