diff --git a/backend/moonstreamapi/routes/queries.py b/backend/moonstreamapi/routes/queries.py
index 0a70eb4d..397dc2b9 100644
--- a/backend/moonstreamapi/routes/queries.py
+++ b/backend/moonstreamapi/routes/queries.py
@@ -352,6 +352,8 @@ async def remove_query_handler(
         )
         for resource in resources.resources
     }
+    if len(query_ids) == 0:
+        raise MoonstreamHTTPException(status_code=404, detail="Query does not existю")
 
     try:
         bc.remove_resources(token=token, resource_id=query_ids[query_name][0])