diff --git a/Modules/domoMaj.py b/Modules/domoMaj.py
index 248006fb7..0a5e20399 100644
--- a/Modules/domoMaj.py
+++ b/Modules/domoMaj.py
@@ -124,7 +124,9 @@ def MajDomoDevice(self, Devices, NWKID, Ep, clusterID, value, Attribute_="", Col
             else:
                 self.log.logging( "Widget", "Error", "WidgetID %s not found, unable to remove the entry from device" % WidgetId, NWKID)
             continue
-
+        elif DeviceUnit not in Devices:
+            continue
+        
         Switchtype = Devices[DeviceUnit].SwitchType
         Subtype = Devices[DeviceUnit].SubType