diff --git a/public/scripts/personas.js b/public/scripts/personas.js
index 9d4b2c83c..ce220ad5f 100644
--- a/public/scripts/personas.js
+++ b/public/scripts/personas.js
@@ -1464,6 +1464,10 @@ async function loadPersonaForCurrentChat({ doRender = false } = {}) {
             toastr.success(message, t`Persona Auto Selected`, { escapeHtml: false });
         }
     }
+    // Even if it's the same persona, we still might need to auto-lock to chat if that's enabled
+    else if (chatPersona && power_user.persona_auto_lock && !chat_metadata['persona']) {
+        lockPersona('chat');
+    }
 
     updatePersonaUIStates();