diff --git a/roomserver/storage/postgres/rooms_table.go b/roomserver/storage/postgres/rooms_table.go
index ef1b7891a..ce635210e 100644
--- a/roomserver/storage/postgres/rooms_table.go
+++ b/roomserver/storage/postgres/rooms_table.go
@@ -79,10 +79,10 @@ const selectRoomIDsSQL = "" +
 	"SELECT room_id FROM roomserver_rooms"
 
 const bulkSelectRoomIDsSQL = "" +
-	"SELECT room_id FROM roomserver_rooms WHERE room_nid IN ($1)"
+	"SELECT room_id FROM roomserver_rooms WHERE room_nid = ANY($1)"
 
 const bulkSelectRoomNIDsSQL = "" +
-	"SELECT room_nid FROM roomserver_rooms WHERE room_id IN ($1)"
+	"SELECT room_nid FROM roomserver_rooms WHERE room_id = ANY($1)"
 
 type roomStatements struct {
 	insertRoomNIDStmt                  *sql.Stmt
diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go
index 3fe9324f5..7e1ccd16d 100644
--- a/roomserver/storage/shared/storage.go
+++ b/roomserver/storage/shared/storage.go
@@ -774,6 +774,9 @@ func (d *Database) GetRoomsByMembership(ctx context.Context, userID, membership
 	}
 	stateKeyNID, err := d.EventStateKeysTable.SelectEventStateKeyNID(ctx, nil, userID)
 	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("GetRoomsByMembership: cannot map user ID to state key NID: %w", err)
 	}
 	roomNIDs, err := d.MembershipTable.SelectRoomsWithMembership(ctx, stateKeyNID, membershipState)