diff --git a/webapp/channels/src/components/advanced_text_editor/use_key_handler.tsx b/webapp/channels/src/components/advanced_text_editor/use_key_handler.tsx
index e5dabcdb95..c5cc58c309 100644
--- a/webapp/channels/src/components/advanced_text_editor/use_key_handler.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/use_key_handler.tsx
@@ -371,6 +371,10 @@ const useKeyHandler = (
         }
     }, [draft.message]);
 
+    useEffect(() => {
+        messageHistoryIndex.current = messageHistory.length;
+    }, [messageHistory]);
+
     // Update last channel switch at
     useEffect(() => {
         lastChannelSwitchAt.current = Date.now();