diff --git a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java
index e1bcdd697..3984218b3 100644
--- a/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java
+++ b/hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/view/util/Filter.java
@@ -116,13 +116,7 @@ public class Filter extends Div {
         final Map<Object, Object> normalized = new HashMap<>(keyToValues)
                 .entrySet()
                 .stream()
-                .map(e -> {
-                    if (e.getValue() instanceof Optional<?> opt) {
-                        e.setValue(opt.orElse(null));
-                    }
-                    return e;
-                })
-                .filter(e -> !ObjectUtils.isEmpty(e))
+                .filter(e -> !ObjectUtils.isEmpty(e.getValue()))
                 .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
         if (normalized.isEmpty()) {
             return null;