diff --git a/homeassistant/observer/Timer.py b/homeassistant/observer/Timer.py
index 7e32aecd2a8..234789d12b9 100644
--- a/homeassistant/observer/Timer.py
+++ b/homeassistant/observer/Timer.py
@@ -36,11 +36,6 @@ class Timer(threading.Thread):
         now = datetime.now()
 
         while True:
-            if self._stop.isSet():
-                break
-
-            self.eventbus.fire(Event(EVENT_TIME_CHANGED, {'now':now}))
-
             while True:
                 time.sleep(1)
 
@@ -49,6 +44,11 @@ class Timer(threading.Thread):
                 if self._stop.isSet() or now.second % TIME_INTERVAL == 0:
                     break
 
+            if self._stop.isSet():
+                break
+
+            self.eventbus.fire(Event(EVENT_TIME_CHANGED, {'now':now}))
+
 
 def track_time_change(eventbus, action, year='*', month='*', day='*', hour='*', minute='*', second='*', point_in_time=None, listen_once=False):
     year, month, day = ensure_list(year), ensure_list(month), ensure_list(day)