diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
index 1ce56b03d..1dd33dd62 100644
--- a/syncapi/routing/messages.go
+++ b/syncapi/routing/messages.go
@@ -318,10 +318,6 @@ func (r *messagesReq) filterHistoryVisible(events []gomatrixserverlib.HeaderedEv
 				hisVisEvent = &queryRes.StateEvents[i]
 			}
 		}
-		if membershipEvent == nil {
-			wasJoined = false
-			break
-		}
 		if hisVisEvent == nil {
 			return events // apply no filtering as it defaults to Shared.
 		}
@@ -329,6 +325,10 @@ func (r *messagesReq) filterHistoryVisible(events []gomatrixserverlib.HeaderedEv
 		if hisVis == "shared" {
 			return events // apply no filtering
 		}
+		if membershipEvent == nil {
+			wasJoined = false
+			break
+		}
 		membership, err := membershipEvent.Membership()
 		if err != nil {
 			wasJoined = false