diff --git a/src/db/roomstore.ts b/src/db/roomstore.ts
index dd838c5492f1e758da34726592967703f5b14277..0928306b605b772bf89c48fd0afa934827016127 100644
--- a/src/db/roomstore.ts
+++ b/src/db/roomstore.ts
@@ -173,12 +173,14 @@ export class DbRoomStore {
                     remote = new RemoteStoreRoom(remoteId, row as any);
                 }
             }
-
-            res.push({
-                id: (entry.id as string),
-                matrix: new MatrixStoreRoom(matrixId),
-                remote,
-            });
+            if (remote) {
+                // Only push rooms with a remote
+                res.push({
+                    id: (entry.id as string),
+                    matrix: new MatrixStoreRoom(matrixId),
+                    remote,
+                });
+            }
         }
         if (res.length > 0) {
             this.entriesMatrixIdCache.set(matrixId, {e: res, ts: Date.now()});
@@ -206,13 +208,14 @@ export class DbRoomStore {
                     remote = new RemoteStoreRoom(remoteId, row as any);
                 }
             }
-
-            res.push({
-                id: (entry.id as string),
-                matrix: matrixId ? new MatrixStoreRoom(matrixId) : null,
-                // tslint:disable-next-line no-any
-                remote,
-            });
+            if (remote) {
+                // Only push rooms with a remote
+                res.push({
+                    id: (entry.id as string),
+                    matrix: new MatrixStoreRoom(matrixId) : null,
+                    remote,
+                });
+            }
         }
         return res;
     }