diff --git a/custom_components/bwalarm/alarm_control_panel.py b/custom_components/bwalarm/alarm_control_panel.py
index fd6f039..b4993c2 100755
--- a/custom_components/bwalarm/alarm_control_panel.py
+++ b/custom_components/bwalarm/alarm_control_panel.py
@@ -768,6 +768,11 @@ def device_state_attributes(self):
 
             'py_version':               sys.version_info,
         }
+  
+        if (self._state == STATE_ALARM_PENDING):
+           results['state_duration'] = self._states[self._armstate][CONF_PENDING_TIME]
+        elif (self._state == STATE_ALARM_WARNING):
+           results['state_duration'] = self._states[self._armstate][CONF_WARNING_TIME]
 
         if (CONF_USERS in self._config):
             results[CONF_USERS] = copy.deepcopy(self._config[CONF_USERS])