diff --git a/apps/counter/api/views.py b/apps/counter/api/views.py
index 4c17c58..40b9288 100644
--- a/apps/counter/api/views.py
+++ b/apps/counter/api/views.py
@@ -50,9 +50,11 @@ class DeviceInfoListAPIView(ListAPIView):
         user_roles = user.role.split(',')
         queryset_list = DeviceInfo.objects.get_queryset().order_by('-online')
         if 'staff' in user_roles or 'admin' in user_roles:
-            queryset_list = DeviceInfo.objects.get_queryset(org=user.org).order_by('-online')
+            queryset_ids = [query.device_id for query in queryset_list if query.org == user.org]
+            queryset_list = queryset_list.filter(device_id__in=queryset_ids)
         device_id = self.request.GET.get('device_id')
         status = self.request.GET.get('status')
+
         if device_id:
             queryset_list = queryset_list.filter(device_id__icontains=device_id)