diff --git a/src/github.com/matrix-org/dendrite/roomserver/query/query.go b/src/github.com/matrix-org/dendrite/roomserver/query/query.go
index 3dc9fa244..836edcef2 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/query/query.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/query/query.go
@@ -271,7 +271,7 @@ func (r *RoomserverQueryAPI) QueryMembershipsForRoom(
 
 	membershipEventNID, stillInRoom, err := r.DB.GetMembership(ctx, roomNID, request.Sender)
 	if err != nil {
-		return nil
+		return err
 	}
 
 	if membershipEventNID == 0 {