diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index 339ed6fc28..89ce4f5f80 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -57,6 +57,7 @@ module.exports = {
         if (this.refs.messageWrapper) {
             var messageWrapper = this.refs.messageWrapper.getDOMNode();
             messageWrapper.removeEventListener('drop', this.onDrop);
+            messageWrapper.removeEventListener('dragover', this.onDragOver);
         }
         dis.unregister(this.dispatcherRef);
         if (MatrixClientPeg.get()) {