diff --git a/syncapi/storage/postgres/current_room_state_table.go b/syncapi/storage/postgres/current_room_state_table.go
index 2918a932a..c63f5e9d6 100644
--- a/syncapi/storage/postgres/current_room_state_table.go
+++ b/syncapi/storage/postgres/current_room_state_table.go
@@ -475,7 +475,10 @@ func (s *currentRoomStateStatements) SelectRoomMembershipOfUser(
 		if err := rows.Scan(&membership); err != nil {
 			return "", err
 		}
-		return membership, nil
+		// Found the membership info
+		if membership != "" {
+			return membership, rows.Err()
+		}
 	}
 
 	return "", nil