diff --git a/STT/whisper_stt_handler.py b/STT/whisper_stt_handler.py
index 06cf613b01156aadcf0ccee9533c0d7aff039930..172a01e63ea1fe7845b48b6ac8c4d653cfb73259 100644
--- a/STT/whisper_stt_handler.py
+++ b/STT/whisper_stt_handler.py
@@ -137,4 +137,7 @@ class WhisperSTTHandler(BaseHandler):
         console.print(f"[yellow]USER: {pred_text}")
         logger.debug(f"Language Code Whisper: {language_code}")
 
+        if self.language is None:
+            language_code += "-auto"
+            
         yield (pred_text, language_code)