diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
index 76dc9ede8..51784245c 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DistributionTagButtons.java
@@ -94,6 +94,9 @@ public class DistributionTagButtons extends AbstractFilterButtons implements Ref
 
     @Override
     protected String createButtonId(final String name) {
+        if (NO_TAG.equals(name)) {
+            return UIComponentIdProvider.NO_TAG_DISTRIBUTION_SET;
+        }
         return name;
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
index 499bd9041..f500c67c9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagFilterButtons.java
@@ -104,7 +104,9 @@ public class TargetTagFilterButtons extends AbstractFilterButtons implements Ref
 
     @Override
     protected String createButtonId(final String name) {
-
+        if (NO_TAG.equals(name)) {
+            return UIComponentIdProvider.NO_TAG_TARGET;
+        }
         return name;
     }
 
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java
index fb6c2d140..e0ab14ae9 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java
@@ -66,6 +66,11 @@ public final class UIComponentIdProvider {
      */
     public static final String TARGET_FILTER_ADD_ICON_ID = "target.filter.add.id";
 
+    /**
+     * ID for NO TAG for targets
+     */
+    public static final String NO_TAG_TARGET = "no.tag.target";
+
     /**
      * ID-Dist. on deployment and distribution view
      */
@@ -119,6 +124,10 @@ public final class UIComponentIdProvider {
      * ID-Dist.PIN.
      */
     public static final String DIST_PIN_BUTTON = "dist.pin.button";
+    /**
+     * ID for NO TAG for distribution sets
+     */
+    public static final String NO_TAG_DISTRIBUTION_SET = "no.tag.distribution.set";
     /**
      * ID for distribution set tag icon
      */