diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java
index 6a4627475..6a9d7db4f 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java
@@ -14,6 +14,7 @@ import java.util.Objects;
 import org.eclipse.hawkbit.ui.common.data.providers.DistributionSetManagementStateDataProvider;
 
 import com.google.common.base.MoreObjects;
+import org.springframework.util.StringUtils;
 
 /**
  * Filter params for {@link DistributionSetManagementStateDataProvider}.
@@ -37,7 +38,7 @@ public class DsFilterParams implements Serializable {
      *            String as search text
      */
     public DsFilterParams(final String searchText) {
-        this.searchText = searchText;
+        this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
     }
 
     /**
@@ -64,7 +65,7 @@ public class DsFilterParams implements Serializable {
      *            String
      */
     public void setSearchText(final String searchText) {
-        this.searchText = searchText;
+        this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
     }
 
     @Override
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java
index 5167d1045..f66ed7616 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java
@@ -14,6 +14,7 @@ import java.util.Objects;
 import org.eclipse.hawkbit.ui.common.data.providers.SoftwareModuleDataProvider;
 
 import com.google.common.base.MoreObjects;
+import org.springframework.util.StringUtils;
 
 /**
  * Filter params for {@link SoftwareModuleDataProvider}.
@@ -44,7 +45,7 @@ public class SwFilterParams implements Serializable {
      */
     public SwFilterParams(final String searchText, final Long softwareModuleTypeId,
             final Long lastSelectedDistributionId) {
-        this.searchText = searchText;
+        this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
         this.softwareModuleTypeId = softwareModuleTypeId;
         this.lastSelectedDistributionId = lastSelectedDistributionId;
     }
@@ -77,7 +78,7 @@ public class SwFilterParams implements Serializable {
      *            String
      */
     public void setSearchText(final String searchText) {
-        this.searchText = searchText;
+        this.searchText = !StringUtils.isEmpty(searchText) ? String.format("%%%s%%", searchText) : null;
     }
 
     /**