diff --git a/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt b/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt
index 5d895fff..f7bd4ad0 100644
--- a/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt
+++ b/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt
@@ -482,11 +482,7 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L
         var processedResult = result
 
         if (processedResult == PromptFormat.getStopToken(currentSettingsFields.modelType)) {
-            if (currentSettingsFields.modelType == ModelType.GEMMA_3 ||
-                currentSettingsFields.modelType == ModelType.LLAVA_1_5
-            ) {
-                module?.stop()
-            }
+            module?.stop()
             return
         }