diff --git a/chirpstack/src/api/device.rs b/chirpstack/src/api/device.rs
index 111a7e91..5fa9a5de 100644
--- a/chirpstack/src/api/device.rs
+++ b/chirpstack/src/api/device.rs
@@ -266,6 +266,11 @@ impl DeviceService for Device {
         let filters = device::Filters {
             application_id: Some(app_id),
             multicast_group_id: mg_id,
+            search: if req.search.is_empty() {
+                None
+            } else {
+                Some(req.search.to_string())
+            },
             ..Default::default()
         };