diff --git a/pilot/model/model_adapter.py b/pilot/model/model_adapter.py
index 57e3cf251..3809729bc 100644
--- a/pilot/model/model_adapter.py
+++ b/pilot/model/model_adapter.py
@@ -164,6 +164,7 @@ def model_adaptation(
 
         # Overwrite model params:
         params["stop"] = conv.stop_str
+        params["stop_token_ids"] = conv.stop_token_ids
 
         return params, model_context
 
diff --git a/pilot/scene/chat_factory.py b/pilot/scene/chat_factory.py
index e50e56efd..40bc89135 100644
--- a/pilot/scene/chat_factory.py
+++ b/pilot/scene/chat_factory.py
@@ -21,7 +21,7 @@ def get_implementation(chat_mode, **kwargs):
         implementation = None
         for cls in chat_classes:
             if cls.chat_scene == chat_mode:
-                metadata = {"cls": str(cls), "params": kwargs}
+                metadata = {"cls": str(cls)}
                 with root_tracer.start_span(
                     "get_implementation_of_chat", metadata=metadata
                 ):