diff --git a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
index 02dcf16bb3cef0dfa0497e219eb674f9f25e5f04..646bf0cdc516690d75d7d6c5f78dfa2d41c29bd4 100644
--- a/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx
@@ -60,21 +60,6 @@ class VideoPlayer extends Component {
     this.registerVideoListeners();
   }
 
-  componentDidUpdate(prevProps) {
-    const { inEchoTest } = this.props;
-    const {
-      mutedByEchoTest,
-    } = this.state;
-
-    if (inEchoTest && !this.player.isMuted() && !mutedByEchoTest) {
-      this.setState({ mutedByEchoTest: true });
-    }
-
-    if (!inEchoTest && prevProps.inEchoTest && mutedByEchoTest) {
-      this.setState({ mutedByEchoTest: false });
-    }
-  }
-
   componentWillUnmount() {
     window.removeEventListener('resize', this.resizeListener);
     this.clearVideoListeners();
@@ -83,6 +68,12 @@ class VideoPlayer extends Component {
     this.player = null;
   }
 
+  static getDerivedStateFromProps(props) {
+    const { inEchoTest } = props;
+
+    return { mutedByEchoTest: inEchoTest };
+  }
+
   getCurrentPlaybackRate() {
     const intPlayer = this.player.getInternalPlayer();