diff --git a/src/crypto/index.js b/src/crypto/index.js
index a1f918f81..27a6a65d4 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -2638,7 +2638,10 @@ Crypto.prototype.trackRoomDevices = function(roomId) {
     let promise = this._roomDeviceTrackingState[roomId];
     if (!promise) {
         promise = trackMembers();
-        this._roomDeviceTrackingState[roomId] = promise;
+        this._roomDeviceTrackingState[roomId] = promise.catch(err => {
+            this._roomDeviceTrackingState[roomId] = null;
+            throw err;
+        });
     }
     return promise;
 };