diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index ac050b9b0..b55d259a0 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -417,9 +417,9 @@ class DeviceController extends mfBaseController
 
     private function getDevices()
     {
-
-        if ($this->allowedPops === null) return [];
-
+        if (!$this->me->is(["Admin"])) {
+            if ($this->allowedPops === null) return [];
+        }
         $devices = DeviceModel::search(['popIds' => $this->allowedPops]);
 
         foreach ($devices as $device) {