diff --git a/homeassistant/components/timer/__init__.py b/homeassistant/components/timer/__init__.py
index 216ab3217a5..2ff408dcd81 100644
--- a/homeassistant/components/timer/__init__.py
+++ b/homeassistant/components/timer/__init__.py
@@ -327,7 +327,9 @@ class Timer(RestoreEntity):
         if self._state != STATUS_ACTIVE:
             return
 
-        self._listener = None
+        if self._listener:
+            self._listener()
+            self._listener = None
         self._state = STATUS_IDLE
         self._end = None
         self._remaining = None