diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.js
index 5b2c25d023..547e45260c 100644
--- a/src/actions/actionCreators.js
+++ b/src/actions/actionCreators.js
@@ -66,7 +66,7 @@ export function createMatrixActionCreator(matrixClient, eventId) {
     return () => {
         matrixClient.on(eventId, listener);
         return () => {
-            matrixClient.removeListener(listener);
+            matrixClient.removeListener(eventId, listener);
         }
     }
 }