diff --git a/templates/speech/daily_briefing.yaml b/templates/speech/daily_briefing.yaml
index 217254b..a64ec09 100644
--- a/templates/speech/daily_briefing.yaml
+++ b/templates/speech/daily_briefing.yaml
@@ -385,14 +385,16 @@
       </p>
 
       <p>
-        {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
-          {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
-            Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
-          {% else %}
-            Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+        {% if state_attr('calendar.garbage_collection','start_time') != none %}
+          {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
+            {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
+              Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
+            {% else %}
+              Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+            {% endif %}
+          {% elif is_state('calendar.garbage_collection','on') %}
+            Today is garbage day. Please make sure to wheel the garbage bin back to the house.
           {% endif %}
-        {% elif is_state('calendar.garbage_collection','on') %}
-          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
         {% endif %}
       </p>
 
diff --git a/templates/speech/morning_briefing.yaml b/templates/speech/morning_briefing.yaml
index 389cf8d..2d3eae6 100644
--- a/templates/speech/morning_briefing.yaml
+++ b/templates/speech/morning_briefing.yaml
@@ -157,14 +157,16 @@
     </p>
 
     <p>
-      {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
-        {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
-          Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
-        {% else %}
-          Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+      {% if state_attr('calendar.garbage_collection','start_time') != none %}
+        {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
+          {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
+            Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
+          {% else %}
+            Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+          {% endif %}
+        {% elif is_state('calendar.garbage_collection','on') %}
+          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
         {% endif %}
-      {% elif is_state('calendar.garbage_collection','on') %}
-        Today is garbage day. If the garbage has already been picked up at this time, please wheel the garbage bin back to the house.
       {% endif %}
     </p>
 
diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml
index 8a5dba8..0655103 100644
--- a/templates/speech/nightly_briefing.yaml
+++ b/templates/speech/nightly_briefing.yaml
@@ -253,14 +253,16 @@
     </p>
 
     <p>
-      {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
-        {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
-          Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
-        {% else %}
-          Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+      {% if state_attr('calendar.garbage_collection','start_time') != none %}
+        {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
+          {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
+            Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
+          {% else %}
+            Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+          {% endif %}
+        {% elif is_state('calendar.garbage_collection','on') %}
+          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
         {% endif %}
-      {% elif is_state('calendar.garbage_collection','on') %}
-          The garbage was picked up today. Please make sure to wheel the garbage bin back to the house if you have not already.
       {% endif %}
     </p>
 
diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml
index 09a792a..736fa84 100644
--- a/templates/speech/welcome_home.yaml
+++ b/templates/speech/welcome_home.yaml
@@ -156,14 +156,16 @@
     </p>
 
     <p>
-      {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
-        {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
-          Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
-        {% else %}
-          Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+      {% if state_attr('calendar.garbage_collection','start_time') != none %}
+        {% if count_the_days('calendar.garbage_collection','start_time') == 1 %}
+          {% if state_attr('calendar.garbage_collection','message') == 'Large Garbage Pickup' %}
+            Tomorrow is the monthly unlimited garbage pickup. Make sure to take out all regular trash, as well as any larger items that need to be disposed of.
+          {% else %}
+            Tomorrow is regular garbage pickup. Make sure that all trash cans are emptied and the outside bin has been wheeled to the curb.
+          {% endif %}
+        {% elif is_state('calendar.garbage_collection','on') %}
+          Today is garbage day. Please make sure to wheel the garbage bin back to the house.
         {% endif %}
-      {% elif is_state('calendar.garbage_collection','on') %}
-        Today is garbage day. If the garbage has already been picked up, please wheel the garbage bin back to the house.
       {% endif %}
     </p>