diff --git a/public/scripts/extensions/memory/index.js b/public/scripts/extensions/memory/index.js
index 96399d177..0b3e1a38e 100644
--- a/public/scripts/extensions/memory/index.js
+++ b/public/scripts/extensions/memory/index.js
@@ -305,8 +305,9 @@ function setMemoryContext(value, saveToMessage) {
     context.setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_prompt_types.AFTER_SCENARIO);
     $('#memory_contents').val(value);
 
-    if (saveToMessage && context.chat.length > 1) {
-        const mes = context.chat[context.chat.length - 2];
+    if (saveToMessage && context.chat.length) {
+        const idx = context.chat.length - 2;
+        const mes = context.chat[idx < 0 ? 0 : idx];
 
         if (!mes.extra) {
             mes.extra = {};