diff --git a/gateway/run.py b/gateway/run.py
index 659ba8013697..0a51b3ace497 100644
--- a/gateway/run.py
+++ b/gateway/run.py
@@ -2464,9 +2464,10 @@ async def _handle_message_with_agent(self, event, source, _quick_key: str):
                                 notice = f"{notice}\n\n{session_info}"
                         except Exception:
                             pass
+                        _reset_meta = {"thread_id": source.thread_id} if source.thread_id else None
                         await adapter.send(
                             source.chat_id, notice,
-                            metadata=getattr(event, 'metadata', None),
+                            metadata=_reset_meta,
                         )
             except Exception as e:
                 logger.debug("Auto-reset notification failed (non-fatal): %s", e)
@@ -7578,8 +7579,9 @@ async def _notify_long_running():
                     first_response = result.get("final_response", "")
                     if first_response and not _already_streamed:
                         try:
+                            _resp_meta = {"thread_id": source.thread_id} if source.thread_id else None
                             await adapter.send(source.chat_id, first_response,
-                                               metadata=getattr(event, "metadata", None))
+                                               metadata=_resp_meta)
                         except Exception as e:
                             logger.warning("Failed to send first response before queued message: %s", e)
                 # else: interrupted — discard the interrupted response ("Operation