diff --git a/STT/lightning_whisper_mlx_handler.py b/STT/lightning_whisper_mlx_handler.py
index d0042aa76bbbf788d2f86e4ff4dfa61f6ef89586..53b6b5a035ec9af062b8f21c562a7a9e6b7e3846 100644
--- a/STT/lightning_whisper_mlx_handler.py
+++ b/STT/lightning_whisper_mlx_handler.py
@@ -83,6 +83,6 @@ class LightningWhisperSTTHandler(BaseHandler):
         logger.debug(f"Language Code Whisper: {language_code}")
 
         if self.start_language == "auto":
-                    language_code += "-auto"
+            language_code += "-auto"
                     
         yield (pred_text, language_code)
diff --git a/STT/whisper_stt_handler.py b/STT/whisper_stt_handler.py
index 172a01e63ea1fe7845b48b6ac8c4d653cfb73259..09300879e1dea3f790e3db40349b1da2b9675888 100644
--- a/STT/whisper_stt_handler.py
+++ b/STT/whisper_stt_handler.py
@@ -40,9 +40,8 @@ class WhisperSTTHandler(BaseHandler):
         self.torch_dtype = getattr(torch, torch_dtype)
         self.compile_mode = compile_mode
         self.gen_kwargs = gen_kwargs
-        if language == 'auto':
-            language = None
-        self.last_language = language
+        self.start_language = language
+        self.last_language = language if language != "auto" else None
         if self.last_language is not None:
             self.gen_kwargs["language"] = self.last_language
 
@@ -137,7 +136,7 @@ class WhisperSTTHandler(BaseHandler):
         console.print(f"[yellow]USER: {pred_text}")
         logger.debug(f"Language Code Whisper: {language_code}")
 
-        if self.language is None:
+        if self.start_language == "auto":
             language_code += "-auto"
             
         yield (pred_text, language_code)