diff --git a/poll-device.php b/poll-device.php
index 354bb2c80b..86a35bbfe8 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -40,7 +40,7 @@ if (isset($options['d'])) { echo("DEBUG!\n"); $debug = 1; }
 
 echo("Starting polling run:\n\n");
 $polled_devices = 0;
-$device_query = mysql_query("SELECT * FROM `devices` WHERE `ignore` = '0' $where  ORDER BY `device_id` ASC");
+$device_query = mysql_query("SELECT * FROM `devices` WHERE `ignore` = 0 AND `disabled` = 0 $where  ORDER BY `device_id` ASC");
 while ($device = mysql_fetch_array($device_query)) {
   $status = 0; unset($array);
   $device_start = utime();  // Start counting device poll time