diff --git a/platypush/plugins/zwave/mqtt/__init__.py b/platypush/plugins/zwave/mqtt/__init__.py
index 49eb2175..c07449c6 100644
--- a/platypush/plugins/zwave/mqtt/__init__.py
+++ b/platypush/plugins/zwave/mqtt/__init__.py
@@ -462,7 +462,9 @@ class ZwaveMqttPlugin(MqttPlugin, ZwaveBasePlugin):
 
     @staticmethod
     def _is_switch(value: Mapping):
-        return value.get('command_class_name', '').endswith('Switch')
+        return (
+            value.get('command_class_name', '').endswith('Switch') if value else False
+        )
 
     def transform_entities(self, values: Iterable[Mapping]):
         entities = []