diff --git a/roomserver/internal/helpers/auth.go b/roomserver/internal/helpers/auth.go
index dce8b778e..03d8bca0b 100644
--- a/roomserver/internal/helpers/auth.go
+++ b/roomserver/internal/helpers/auth.go
@@ -228,7 +228,7 @@ func loadAuthEvents(
 	}
 	roomID := ""
 	for _, ev := range result.events {
-		if ev.RoomID() != "" {
+		if roomID == "" {
 			roomID = ev.RoomID()
 		}
 		if ev.RoomID() != roomID {