diff --git a/html/includes/table/devices.inc.php b/html/includes/table/devices.inc.php
index 462289285..dd5e36c03 100644
--- a/html/includes/table/devices.inc.php
+++ b/html/includes/table/devices.inc.php
@@ -3,10 +3,11 @@
 $where = 1;
 $param = array();
 
-$sql = " FROM `devices`, `devices_perms` AS `DP`";
+$sql = " FROM `devices`";
 
 if (is_admin() === FALSE && is_read() === FALSE) {
-    $where .= " AND `devices`.`device_id`=`DP`.`device_id` AND `DP`.`user_id`=?";
+    $sql .= " LEFT JOIN `devices_perms` AS `DP` ON `devices`.`device_id` = `DP`.`device_id`";
+    $where .= " AND (`devices`.`device_id`=`DP`.`device_id` AND `DP`.`user_id`=?)";
     $param[] = $_SESSION['user_id'];
 }