diff --git a/src/db/roomstore.ts b/src/db/roomstore.ts
index bdb5b373f6a6b6e4ba741d088f1f3a80b051cbe1..90d518343602e6e5ad7a117ce2c64cd0ff5aa2b1 100644
--- a/src/db/roomstore.ts
+++ b/src/db/roomstore.ts
@@ -244,11 +244,9 @@ export class DbRoomStore {
     }
 
     public async getEntriesByRemoteRoomData(data: IRemoteRoomDataLazy): Promise<IRoomStoreEntry[]> {
-        for (const k of ["update_name", "update_topic", "update_icon", "plumbed"]) {
-            if (data[k]) {
-                data[k] = Number(data[k] || 0);
-            }
-        }
+        Object.keys(data).filter((k) => typeof(data[k]) === "boolean").forEach((k) => {
+            data[k] = Number(data[k] || 0);
+        });
 
         const whereClaues = Object.keys(data).map((key) => {
             return `${key} = $${key}`;