diff --git a/backend/open_webui/routers/chats.py b/backend/open_webui/routers/chats.py
index ab558c5c8..7f0172d0e 100644
--- a/backend/open_webui/routers/chats.py
+++ b/backend/open_webui/routers/chats.py
@@ -1028,6 +1028,11 @@ async def delete_chat_by_id(
 ):
     if user.role == "admin":
         chat = Chats.get_chat_by_id(id, db=db)
+        if not chat:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=ERROR_MESSAGES.NOT_FOUND,
+            )
         for tag in chat.meta.get("tags", []):
             if Chats.count_chats_by_tag_name_and_user_id(tag, user.id, db=db) == 1:
                 Tags.delete_tag_by_name_and_user_id(tag, user.id, db=db)
@@ -1045,6 +1050,11 @@ async def delete_chat_by_id(
             )
 
         chat = Chats.get_chat_by_id(id, db=db)
+        if not chat:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=ERROR_MESSAGES.NOT_FOUND,
+            )
         for tag in chat.meta.get("tags", []):
             if Chats.count_chats_by_tag_name_and_user_id(tag, user.id, db=db) == 1:
                 Tags.delete_tag_by_name_and_user_id(tag, user.id, db=db)