diff --git a/packages/save_tts_messages.yaml b/packages/save_tts_messages.yaml
index 99d2ac2a..a0e2d11a 100644
--- a/packages/save_tts_messages.yaml
+++ b/packages/save_tts_messages.yaml
@@ -165,6 +165,7 @@ script:
                               {% elif now().day - date.day > 6%} {{ date.strftime('%A, %B %-d at %-I:%M %p') }}
                               {% else %} {{ date.strftime('%A at %-I:%M %p') }}
                               {%- endif -%}
+                          continue_on_error: true
 
       - action: script.tts_clear_saved_messages
 
diff --git a/scripts/media/tts/tts_play.yaml b/scripts/media/tts/tts_play.yaml
index 5c54e72b..354d1366 100644
--- a/scripts/media/tts/tts_play.yaml
+++ b/scripts/media/tts/tts_play.yaml
@@ -63,7 +63,8 @@ tts_play:
         alert: "{{ alert | default(false) }}"
         #MASS redirect tts to active mass player for resume, use first group or first single player found
         #HACK to make sure mass always resumes
-        media_active: "{{ is_state('binary_sensor.speaker', 'on') }}"
+        #ISSUE subsequent TTS messages play on reg tts player, mass not resumed
+        media_active: "{{ is_state('binary_sensor.speaker', 'on') and is_state('input_boolean.tts', 'off') }}"
         active_player: >
           {% if media_active %}
             {% set group = expand(state_attr('binary_sensor.speaker', 'entity_id'))
@@ -74,11 +75,9 @@ tts_play:
                 | map(attribute='entity_id') | list %}
             {% if group[0] is defined or single[0] is defined %}
               {{ group[0] if group not in [[], none] else single[0] }}
-            {% else %} {{ none }}
             {% endif %}
-          {% else %} {{ none }}
           {% endif %}
-        #HACK can't dynamically add so redirect
+        #HACK can't dynamically add shower speaker so redirect
         shower_tts: "{{ is_state('switch.shower_scene', 'on') }}"
         shower_player: >
           {{ expand('group.tts_media_players')