diff --git a/roomserver/query/query.go b/roomserver/query/query.go
index 9f3f44198..94f8d97fe 100644
--- a/roomserver/query/query.go
+++ b/roomserver/query/query.go
@@ -108,7 +108,8 @@ func (r *RoomserverQueryAPI) QueryLatestEventsAndState(
 ) error {
 	roomVersion, err := r.DB.GetRoomVersionForRoom(ctx, request.RoomID)
 	if err != nil {
-		return err
+		response.RoomExists = false
+		return nil
 	}
 
 	roomState := state.Prepare(r.DB)
@@ -158,7 +159,8 @@ func (r *RoomserverQueryAPI) QueryStateAfterEvents(
 ) error {
 	roomVersion, err := r.DB.GetRoomVersionForRoom(ctx, request.RoomID)
 	if err != nil {
-		return err
+		response.RoomExists = false
+		return nil
 	}
 
 	roomState := state.Prepare(r.DB)