diff --git a/application/Device/DeviceController.php b/application/Device/DeviceController.php
index 8f549a316..59b776084 100644
--- a/application/Device/DeviceController.php
+++ b/application/Device/DeviceController.php
@@ -399,8 +399,7 @@ class DeviceController extends mfBaseController
         foreach ($devices as $device) {
             $locationText = "";
             $locationUrl = "";
-
-            if (isset($device->pop) && trim($device->pop->name)) {
+            if ($device->pop_id && trim($device->pop->name)) {
                 $locationText = $device->pop->name;
                 $locationUrl = self::getUrl("Pop", "Detail", ["id" => $device->pop->id]);
             } else if (trim($device->addr_street)) {