diff --git a/backend/main.py b/backend/main.py
index 2c0c810c92..c59f631b3c 100644
--- a/backend/main.py
+++ b/backend/main.py
@@ -525,9 +525,8 @@ async def dispatch(self, request: Request, call_next):
             "chat_id": body.pop("chat_id", None),
             "message_id": body.pop("id", None),
             "session_id": body.pop("session_id", None),
-            "valves": body.pop("valves", None),
-            "tool_ids": body.pop("tool_ids", None),
-            "files": body.pop("files", None),
+            "tool_ids": body.get("tool_ids", None),
+            "files": body.get("files", None),
         }
         body["metadata"] = metadata
 
@@ -560,6 +559,13 @@ async def dispatch(self, request: Request, call_next):
                 content={"detail": str(e)},
             )
 
+        metadata = {
+            **metadata,
+            "tool_ids": body.pop("tool_ids", None),
+            "files": body.pop("files", None),
+        }
+        body["metadata"] = metadata
+
         try:
             body, flags = await chat_completion_tools_handler(body, user, extra_params)
             contexts.extend(flags.get("contexts", []))