diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
index b853bd385..e8f1bb992 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/view/TargetView.java
@@ -204,7 +204,7 @@ public class TargetView extends TableView<TargetView.TargetWithDs, String> {
                             List.of("controllerid", "name"), textFilter.getOptionalValue().map(s -> "*" + s + "*"),
                             "targettype.name", type.getSelectedItems().stream().map(MgmtTargetType::getName)
                                     .toList(),
-                            "tag", tag.getSelectedItems().stream().map(MgmtTag::getName).toList()));
+                            "tag", tag.getSelectedItems().stream().map(t -> "\"" + t.getName() + "\"").toList()));
         }
     }