diff --git a/backend/open_webui/utils/subagents.py b/backend/open_webui/utils/subagents.py
index 13b9699216..f020e0cd94 100644
--- a/backend/open_webui/utils/subagents.py
+++ b/backend/open_webui/utils/subagents.py
@@ -219,6 +219,7 @@ async def process_pending_internal_messages(
             history['messages'] = messages
             history['currentId'] = assistant_message_id
             chat.chat = {**(chat.chat or {}), 'history': history}
+            chat.current_message_id = assistant_message_id
             chat.updated_at = int(time.time())
             await db.commit()
 
diff --git a/backend/open_webui/utils/timers.py b/backend/open_webui/utils/timers.py
index 15a6b898db..c2a91139ef 100644
--- a/backend/open_webui/utils/timers.py
+++ b/backend/open_webui/utils/timers.py
@@ -351,6 +351,7 @@ async def execute_due_timer(app, timer_id: str, claim_id: str | None = None) ->
 
                 parent.chat = parent_chat
                 history['currentId'] = assistant_message_id
+                parent.current_message_id = assistant_message_id
                 parent.updated_at = int(time.time())
                 timer_row = await db.get(Chat, timer_id)
                 if timer_row: