diff --git a/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java b/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java
index 7bbbfc5d6a044..81c2132d7ecea 100644
--- a/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java
+++ b/addons/io/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitTaggedItem.java
@@ -45,6 +45,9 @@ public HomekitTaggedItem(Item item, ItemRegistry itemRegistry) {
             if (homekitDeviceType == null) {
                 homekitCharacteristicType = HomekitCharacteristicType.valueOfTag(tag);
             }
+            if (homekitDeviceType != null || homekitCharacteristicType != null) {
+                break;
+            }
         }
         if (homekitDeviceType != null) {
             this.id = calculateId(item);