diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index f810e44d2..b55d259a0 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -18,7 +18,7 @@ class DeviceController extends mfBaseController
             $this->allowedPops = null;
         } else {
             $networkIds = array_column($this->me->getProperty('my_networks'), 'id');
-            $pops=PopNetworkModel::search(['Networks' => $networkIds]);
+            $pops = PopNetworkModel::search(['Networks' => $networkIds]);
             foreach ($pops as $pop) {
                 $popIds[] = $pop->pop_id;
             }
@@ -28,7 +28,7 @@ class DeviceController extends mfBaseController
 
     protected function indexAction()
     {
-        $deviceManufacturers = array_map(function($deviceManufacturer) {
+        $deviceManufacturers = array_map(function ($deviceManufacturer) {
             return [
                 "id" => $deviceManufacturer->id,
                 "name" => $deviceManufacturer->name,
@@ -37,7 +37,7 @@ class DeviceController extends mfBaseController
             ];
         }, DevicemanufactorModel::getAll());
 
-        $deviceTypes = array_map(function($deviceType) {
+        $deviceTypes = array_map(function ($deviceType) {
             return [
                 "id" => $deviceType->id,
                 "name" => $deviceType->name,
@@ -96,7 +96,7 @@ class DeviceController extends mfBaseController
         $this->layout()->setTemplate("Device/Detail");
         $devicesconfig = DeviceModel::getconifg($id);
         $devices = DeviceModel::getOne($id);
-        $devicesall= DeviceModel::getAll();
+        $devicesall = DeviceModel::getAll();
 
         if ($devices->devicetype->olt == "1") {
             $customer = DeviceModel::getOltCustomer($device->ip);
@@ -417,6 +417,9 @@ class DeviceController extends mfBaseController
 
     private function getDevices()
     {
+        if (!$this->me->is(["Admin"])) {
+            if ($this->allowedPops === null) return [];
+        }
         $devices = DeviceModel::search(['popIds' => $this->allowedPops]);
 
         foreach ($devices as $device) {