diff --git a/vite/src/pages/flow_free.jsx b/vite/src/pages/flow_free.jsx
index feb3a8d..1dcf838 100644
--- a/vite/src/pages/flow_free.jsx
+++ b/vite/src/pages/flow_free.jsx
@@ -276,14 +276,7 @@ export function FreeFlow(){
                 //sendMessage(null, false, false, null); // Send initial message with voice      
                 //setChatWelcome(true);               
                 resetData(); // Reset data for new conversation  
-                break;
-            // case 'chat_end':
-            //     const message= refInput.current?.value?.trim();
-            //     console.log('Ending conversation with message:', message);
-            //     sendMessage(message, false, true, null);
-            //     setChatWelcome(false);
-            //     setChatStatus(ChatStatus.Clear);
-            //     break;            
+                break;   
             
             case 'summary':
                 console.log('Getting summary...');
@@ -363,6 +356,9 @@ export function FreeFlow(){
         }else{
             sendOsc(OSC_ADDRESS.COUNTDOWN, '0'); // Reset countdown for non-chat cues
         }
+        if(cue.numpad_type=='choice'){
+            setChoice();
+        }
 
         sendOscStatus(OSC_ADDRESS.CLIENT_STATUS,`${data.id}#playcue#${cue.id}`);
 
@@ -396,6 +392,14 @@ export function FreeFlow(){
         }
         sendOsc(OSC_ADDRESS.SPEECH, 'stop');
 
+        if(cue.numpad_type=='password'){
+            if(!choice){
+                console.log('set default choice to save');
+                setChoice('save');
+                sendOsc(OSC_ADDRESS.CHOICE, 'save'); // Send OSC save choice message
+            }
+        }
+
         refAudio.current?.pause(); // Pause any playing audio
         console.log('onCueEnd:', cue.id);