diff --git a/clientapi/routing/getevent.go b/clientapi/routing/getevent.go
index db0500bd1..a5e12a9cf 100644
--- a/clientapi/routing/getevent.go
+++ b/clientapi/routing/getevent.go
@@ -103,24 +103,18 @@ func GetEvent(
 		}
 	}
 
-	allowed := false
 	for _, stateEvent := range stateResp.StateEvents {
 		if stateEvent.StateKeyEquals(r.device.UserID) {
 			membership, err := stateEvent.Membership()
 			if err == nil && membership == "join" {
-				allowed = true
-				break
+				return util.JSONResponse{
+					Code: http.StatusOK,
+					JSON: gomatrixserverlib.ToClientEvent(r.requestedEvent, gomatrixserverlib.FormatAll),
+				}
 			}
 		}
 	}
 
-	if allowed {
-		return util.JSONResponse{
-			Code: http.StatusOK,
-			JSON: gomatrixserverlib.ToClientEvent(r.requestedEvent, gomatrixserverlib.FormatAll),
-		}
-	}
-
 	return util.JSONResponse{
 		Code: http.StatusNotFound,
 		JSON: jsonerror.NotFound("The event was not found or you do not have permission to read this event."),