diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py
index 849e68d0a7f..8748ef86572 100644
--- a/homeassistant/components/sensor/zwave.py
+++ b/homeassistant/components/sensor/zwave.py
@@ -66,7 +66,8 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
           value.type == zwave.TYPE_DECIMAL):
         add_devices([ZWaveMultilevelSensor(value)])
 
-    elif value.command_class == zwave.COMMAND_CLASS_ALARM:
+    elif (value.command_class == zwave.COMMAND_CLASS_ALARM or
+          value.command_class == zwave.COMMAND_CLASS_SENSOR_ALARM):
         add_devices([ZWaveAlarmSensor(value)])