diff --git a/src/components/views/voip/VideoView.js b/src/components/views/voip/VideoView.js
index 0a95e0d0c8..5145f05954 100644
--- a/src/components/views/voip/VideoView.js
+++ b/src/components/views/voip/VideoView.js
@@ -25,8 +25,12 @@ var dis = require('../../../dispatcher');
 module.exports = React.createClass({
     displayName: 'VideoView',
 
-    componentWillMount: function() {
-        dis.register(this.onAction);
+    componentDidMount: function() {
+        this.dispatcherRef = dis.register(this.onAction);
+    },
+
+    componentWillUnmount: function() {
+        dis.unregister(this.dispatcherRef);
     },
 
     getRemoteVideoElement: function() {