diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php
index d888dc583e..9dcf277de7 100644
--- a/html/pages/device.inc.php
+++ b/html/pages/device.inc.php
@@ -6,6 +6,11 @@ if ($vars['tab'] == "port" && is_numeric($vars['device']) && port_permitted($var
   $permit_ports = 1;
 }
 
+$device  = device_by_id_cache($vars['device']);
+if (!$device) {
+  $vars['device'] = device_by_name($vars['device']);
+  $device  = device_by_id_cache($vars['device']);
+}
 
 if (device_permitted($vars['device']) || $check_device == $vars['device'])
 {
@@ -20,7 +25,6 @@ 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']);