diff --git a/server/src/resolvers/Query/userPresence.js b/server/src/resolvers/Query/userPresence.js
index 6b5d7c5..c9791f0 100644
--- a/server/src/resolvers/Query/userPresence.js
+++ b/server/src/resolvers/Query/userPresence.js
@@ -29,7 +29,10 @@ export async function userPresence(_, { search }) {
             (device.ip?.startsWith(search) ||
               device.apName?.contains(search) ||
               device.essid?.contains(search) ||
-              device.hostname?.contains(search))
+              device.hostname?.contains(search) ||
+              device.accessPoint?.name?.contains(search) ||
+              device.accessPoint?.local?.contains(search)
+            )
         )
     )
     : usersWithWifiDevices