diff --git a/custom_components/nuki_ng/nuki.py b/custom_components/nuki_ng/nuki.py
index 00c791e..a4757b2 100644
--- a/custom_components/nuki_ng/nuki.py
+++ b/custom_components/nuki_ng/nuki.py
@@ -276,6 +276,7 @@ async def web_list(self):
             result[item.get("smartlockId")] = {
                 "deviceType": item.get("type"),
                 "nukiId": item.get("smartlockId"),
+                "web": True,
                 "name": item.get("name"),
                 "firmwareVersion": str(item.get("firmwareVersion")),
                 "config": item.get("config"),
@@ -374,6 +375,8 @@ async def _update(self):
             device_list = None
             web_list = None
             def web_id_for_item(item):
+                if item.get("web"):
+                    return item["nukiId"] # Already in web mode
                 as_hex = "{0:x}".format(item["nukiId"])
                 deviceType = item.get("deviceType", 0)
                 if deviceType == 2: