diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go
index f69f67f7..408f9766 100644
--- a/roomserver/internal/query/query.go
+++ b/roomserver/internal/query/query.go
@@ -241,6 +241,9 @@ func (r *Queryer) QueryMembershipsForRoom(
 	if err != nil {
 		return err
 	}
+	if info == nil {
+		return nil
+	}
 
 	// If no sender is specified then we will just return the entire
 	// set of memberships for the room, regardless of whether a specific