diff --git a/app/views/Device.php b/app/views/Device.php
index 4d0bba8..bd48bcf 100644
--- a/app/views/Device.php
+++ b/app/views/Device.php
@@ -62,6 +62,10 @@ class Device extends Template
 			}
 
 			//Firmware Status
+			if (empty($devices[$key]['mac'])) {
+				$devices[$key]['firmware_hash'] = "";
+				continue;
+			}
 			$localBinary = "../updater/" . str_replace(':', '', $device['mac']) . ".bin";
 			$devices[$key]['firmware_hash'] = "";
 			if (file_exists($localBinary)) {
diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml
index 5499fe5..6b4832c 100644
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -32,9 +32,9 @@
 					<th><a href="device/signal/<?php echo $SORTTYPE; ?>">Signal</a><i class="fa"><?php echo (!empty($SORTICON['signal']) ? $SORTICON['signal'] : ""); ?></i></th>
 					<th><a href="device/firmware/<?php echo $SORTTYPE; ?>">Firmware</a><i class="fa"><?php echo (!empty($SORTICON['firmware']) ? $SORTICON['firmware'] : ""); ?></i></th>
 					<th>
-						<a href="/device/ip/<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br>
-						<a href="/device/mac/<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
-						<a href="/device/token/<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
+						<a href="device/ip/<?php echo $SORTTYPE; ?>">IP Address</a><i class="fa"><?php echo (!empty($SORTICON['ip']) ? $SORTICON['ip'] : ""); ?></i><br>
+						<a href="device/mac/<?php echo $SORTTYPE; ?>">(Mac)</a><i class="fa"><?php echo (!empty($SORTICON['mac']) ? $SORTICON['mac'] : ""); ?></i><br>
+						<a href="device/token/<?php echo $SORTTYPE; ?>">Token</a><i class="fa"><?php echo (!empty($SORTICON['token']) ? $SORTICON['token'] : ""); ?></i>
 					</th>
 					<th>Action
 						<form method="post" action="">