diff --git a/app/devices/devices.php b/app/devices/devices.php
index 141a703d9b..eaa58e76f6 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -118,7 +118,7 @@ else {
 			$sql .= ") ";
 		}
 		if (strlen($order_by) == 0) {
-			$sql .= "order by device_mac_address asc ";
+			$sql .= "order by device_label, device_description asc ";
 		}
 		else {
 			$sql .= "order by $order_by $order ";