diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6 b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
index f0648ecc100..15fcee7bb78 100644
--- a/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
+++ b/plugins/discourse-local-dates/assets/javascripts/discourse-local-dates.js.no-module.es6
@@ -215,6 +215,7 @@
       }
 
       if (
+        options.timezone &&
         displayedTimezone === watchingUserTimezone &&
         options.timezone !== displayedTimezone &&
         !compareZones(displayedTimezone, options.timezone)
@@ -222,7 +223,7 @@
         timezones.unshift(options.timezone);
       }
 
-      timezones.forEach(timezone => {
+      timezones.filter(z => z).forEach(timezone => {
         if (compareZones(timezone, displayedTimezone)) {
           return;
         }