diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp
index 9394800b6..260c7dda3 100644
--- a/radio/src/translations/tts_es.cpp
+++ b/radio/src/translations/tts_es.cpp
@@ -87,11 +87,11 @@ enum SpanishPrompts {
 
 };
 
-  #define ES_PUSH_UNIT_PROMPT(u) es_pushUnitPrompt((u), id)
+#define ES_PUSH_UNIT_PROMPT(u) es_pushUnitPrompt((u), id)
 
 I18N_PLAY_FUNCTION(es, pushUnitPrompt, uint8_t unitprompt)
 {
-    PUSH_UNIT_PROMPT(unitprompt, 0);
+  PUSH_UNIT_PROMPT(unitprompt, 0);
 }
 
 I18N_PLAY_FUNCTION(es, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
@@ -194,16 +194,20 @@ I18N_PLAY_FUNCTION(es, playDuration, int seconds PLAY_DURATION_ATT)
       PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
       PUSH_UNIT_PROMPT(UNIT_MINUTES, 0);
     }
-    PUSH_NUMBER_PROMPT(ES_PROMPT_Y);
+    if (seconds > 0) {
+      PUSH_NUMBER_PROMPT(ES_PROMPT_Y);
+    }
   }
 
-  if (seconds != 1) {
-    PLAY_NUMBER(seconds, 0, 0);
-    PUSH_UNIT_PROMPT(UNIT_SECONDS, 1);
-  }
-  else {
-    PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
-    PUSH_UNIT_PROMPT(UNIT_SECONDS, 0);
+  if (seconds > 0) {
+    if (seconds != 1) {
+      PLAY_NUMBER(seconds, 0, 0);
+      PUSH_UNIT_PROMPT(UNIT_SECONDS, 1);
+    }
+    else {
+      PUSH_NUMBER_PROMPT(ES_PROMPT_UNA);
+      PUSH_UNIT_PROMPT(UNIT_SECONDS, 0);
+    }
   }
 }
 
diff --git a/radio/util/tts_es.py b/radio/util/tts_es.py
index 6ec5ffcd3..e4de3aea4 100755
--- a/radio/util/tts_es.py
+++ b/radio/util/tts_es.py
@@ -20,7 +20,7 @@ systemSounds.append(("setecientos", filename(PROMPT_SYSTEM_BASE + 107)))
 systemSounds.append(("ochocientos", filename(PROMPT_SYSTEM_BASE + 108)))
 systemSounds.append(("nuevecientos", filename(PROMPT_SYSTEM_BASE + 109)))
 systemSounds.append(("mil", filename(PROMPT_SYSTEM_BASE + 110)))
-for i, s in enumerate(["coma", "un", "una", "y", "meno", "hora", "horas", "minuto", "minutos", "segundo", "segundos"]):
+for i, s in enumerate(["coma", "un", "una", "i", "meno", "hora", "horas", "minuto", "minutos", "segundo", "segundos"]):
     systemSounds.append((s, filename(PROMPT_SYSTEM_BASE + 111 + i)))
 for i, (s, f) in enumerate([("Voltio","volt0"),
                             ("ampério", "amp0"),