diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index 9dcf277de..0e2c166b2 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -6,10 +6,8 @@ if ($vars['tab'] == "port" && is_numeric($vars['device']) && port_permitted($var
   $permit_ports = 1;
 }
 
-$device  = device_by_id_cache($vars['device']);
-if (!$device) {
+if (!is_numeric($vars['device'])) {
   $vars['device'] = device_by_name($vars['device']);
-  $device  = device_by_id_cache($vars['device']);
 }
 
 if (device_permitted($vars['device']) || $check_device == $vars['device'])
@@ -25,6 +23,7 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
 
   $select[$tab] = "active";
 
+  $device  = device_by_id_cache($vars['device']);
   $attribs = get_dev_attribs($device['device_id']);
 
   $entity_state = get_dev_entity_state($device['device_id']);