diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
index 8aa72fe31..5b8c2b370 100644
--- a/includes/polling/functions.inc.php
+++ b/includes/polling/functions.inc.php
@@ -205,8 +205,6 @@ function poll_device($device, $options)
     unset($storage_cache); // Clear cache of hrStorage ** MAYBE FIXME? **
     unset($cache); // Clear cache (unify all things here?)
   }
-
-  $polled_devices++;
 }
 
 ?>
diff --git a/poller.php b/poller.php
index 93624db85..3f3c33792 100755
--- a/poller.php
+++ b/poller.php
@@ -97,8 +97,8 @@ if (!isset($query))
 foreach (dbFetch($query) as $device)
 {
   $device = dbFetchRow("SELECT * FROM `devices` WHERE `device_id` = '".$device['device_id']."'");
-
   poll_device($device, $options);
+  $polled_devices++;
 }
 
 $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time = substr($poller_run, 0, 5);