diff --git a/homeassistant/components/zwave/lock.py b/homeassistant/components/zwave/lock.py
index c907d5101a9..b19b06761c4 100644
--- a/homeassistant/components/zwave/lock.py
+++ b/homeassistant/components/zwave/lock.py
@@ -42,7 +42,10 @@ DEVICE_MAPPINGS = {
     # Yale YRD210, Yale YRD240
     (0x0129, 0x0209): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
     (0x0129, 0xAA00): WORKAROUND_DEVICE_STATE,
-    (0x0129, 0x0000): WORKAROUND_DEVICE_STATE,
+    # Yale YRL220/YRD220
+    (0x0129, 0x0000): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
+    # Yale YRD120
+    (0x0129, 0x0800): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
     # Yale YRD220 (as reported by adrum in PR #17386)
     (0x0109, 0x0000): WORKAROUND_DEVICE_STATE | WORKAROUND_ALARM_TYPE,
     # Schlage BE469