diff --git a/ui/desktop/src/hooks/useChatEngine.ts b/ui/desktop/src/hooks/useChatEngine.ts
index 512bffd091c4..910c81a19937 100644
--- a/ui/desktop/src/hooks/useChatEngine.ts
+++ b/ui/desktop/src/hooks/useChatEngine.ts
@@ -264,6 +264,11 @@ export const useChatEngine = ({
       // Set the text back to the input field
       _setInput(textValue);
 
+      // Also add to local storage history as a backup so cmd+up can retrieve it
+      if (enableLocalStorage && textValue.trim()) {
+        LocalMessageStorage.addMessage(textValue.trim());
+      }
+
       // Remove the last user message if it's the most recent one
       if (messages.length > 1) {
         setMessages(messages.slice(0, -1));
@@ -325,7 +330,7 @@ export const useChatEngine = ({
         setMessages([...messages, responseMessage]);
       }
     }
-  }, [stop, messages, _setInput, setMessages]);
+  }, [stop, messages, _setInput, setMessages, enableLocalStorage]);
 
   const filteredMessages = useMemo(() => {
     return [...ancestorMessages, ...messages].filter((message) => message.display ?? true);