diff --git a/bundles/org.openhab.binding.bluetooth.hdpowerview/src/main/java/org/openhab/binding/bluetooth/hdpowerview/internal/shade/ShadeHandler.java b/bundles/org.openhab.binding.bluetooth.hdpowerview/src/main/java/org/openhab/binding/bluetooth/hdpowerview/internal/shade/ShadeHandler.java
index e05e86fbbfd..2fe27fddaa7 100644
--- a/bundles/org.openhab.binding.bluetooth.hdpowerview/src/main/java/org/openhab/binding/bluetooth/hdpowerview/internal/shade/ShadeHandler.java
+++ b/bundles/org.openhab.binding.bluetooth.hdpowerview/src/main/java/org/openhab/binding/bluetooth/hdpowerview/internal/shade/ShadeHandler.java
@@ -487,15 +487,15 @@ public class ShadeHandler extends BeaconBluetoothHandler {
                     removeChannels.add(channel);
                 }
             }
-            boolean isDrape = ShadeCapabilitiesDatabase.DRAPES_TYPES.contains(dataReader.getTypeId());
-            if (!removeChannels.isEmpty() || isDrape) {
+            boolean isDrapes = ShadeCapabilitiesDatabase.DRAPES_TYPES.contains(dataReader.getTypeId());
+            if (isDrapes || !removeChannels.isEmpty()) {
                 ThingBuilder thingBuilder = editThing();
+                if (isDrapes) {
+                    thingBuilder = thingBuilder.withSemanticEquipmentTag(Equipment.DRAPES);
+                }
                 if (!removeChannels.isEmpty()) {
                     thingBuilder = thingBuilder.withoutChannels(removeChannels);
                 }
-                if (isDrape) {
-                    thingBuilder = thingBuilder.withSemanticEquipmentTag(Equipment.DRAPES);
-                }
                 updateThing(thingBuilder.build());
             }
         }