diff --git a/api/server/services/Runs/StreamRunManager.js b/api/server/services/Runs/StreamRunManager.js
index 2059de6a54..072c38d27c 100644
--- a/api/server/services/Runs/StreamRunManager.js
+++ b/api/server/services/Runs/StreamRunManager.js
@@ -571,7 +571,7 @@ class StreamRunManager {
     const isMessage = step.type === StepTypes.MESSAGE_CREATION;
 
     if (isMessage) {
-      logger.warn('RunStep Message completion: to be handled by Message Event.', step);
+      logger.debug('RunStep Message completion: to be handled by Message Event.', step);
       return;
     }
 
diff --git a/client/src/routes/ChatRoute.tsx b/client/src/routes/ChatRoute.tsx
index db08888933..c43b452b25 100644
--- a/client/src/routes/ChatRoute.tsx
+++ b/client/src/routes/ChatRoute.tsx
@@ -65,6 +65,7 @@ export default function ChatRoute() {
         /* this is necessary to load all existing settings */
         preset: initialConvoQuery.data as TPreset,
         modelsData: modelsQuery.data,
+        keepLatestMessage: true,
       });
       hasSetConversation.current = !!assistants;
     } else if (!hasSetConversation.current && conversationId === 'new' && assistants) {
@@ -75,6 +76,7 @@ export default function ChatRoute() {
         template: initialConvoQuery.data,
         preset: initialConvoQuery.data as TPreset,
         modelsData: modelsQuery.data,
+        keepLatestMessage: true,
       });
       hasSetConversation.current = true;
     }