diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go
index f76c93166..b34ae7701 100644
--- a/roomserver/internal/query/query.go
+++ b/roomserver/internal/query/query.go
@@ -140,6 +140,9 @@ func (r *Queryer) QueryMembershipForUser(
 	if err != nil {
 		return err
 	}
+	if info == nil {
+		return fmt.Errorf("QueryMembershipForUser: unknown room %s", request.RoomID)
+	}
 
 	membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, info.RoomNID, request.UserID)
 	if err != nil {
diff --git a/roomserver/storage/shared/storage.go b/roomserver/storage/shared/storage.go
index 1b96fc4af..5c18c7250 100644
--- a/roomserver/storage/shared/storage.go
+++ b/roomserver/storage/shared/storage.go
@@ -843,6 +843,10 @@ func (d *Database) GetBulkStateContent(ctx context.Context, roomIDs []string, tu
 		if err2 != nil {
 			return nil, fmt.Errorf("GetBulkStateContent: failed to load room info for room %s : %w", roomID, err2)
 		}
+		// for unknown rooms or rooms which we don't have the current state, skip them.
+		if roomInfo == nil || roomInfo.IsStub {
+			continue
+		}
 		entries, err2 := d.loadStateAtSnapshot(ctx, roomInfo.StateSnapshotNID)
 		if err2 != nil {
 			return nil, fmt.Errorf("GetBulkStateContent: failed to load state for room %s : %w", roomID, err2)