diff --git a/custom_components/keymaster/coordinator.py b/custom_components/keymaster/coordinator.py
index 4179c8bd..1754a9cd 100644
--- a/custom_components/keymaster/coordinator.py
+++ b/custom_components/keymaster/coordinator.py
@@ -526,6 +526,10 @@ async def _handle_lock_state_change(
         if not event:
             return
 
+        # Ignore events without a user_id - they're from zwave - let handle_zwave_js_lock_event handle it
+        if event.context.as_dict()["user_id"] is None:
+            return
+
         changed_entity: str = event.data["entity_id"]
 
         # Don't do anything if the changed entity is not this lock