diff --git a/poll-device.php b/poll-device.php
index e3dc90ff6..58e0322c8 100755
--- a/poll-device.php
+++ b/poll-device.php
@@ -178,15 +178,6 @@ while ($device = mysql_fetch_array($device_query)) {
     $seperator = ", ";
   } 
   $update .= $seperator . "`last_polled` = NOW()";
-  if ($update) {
-    $update_query  = "UPDATE `devices` SET ";
-    $update_query .= $update;
-    $update_query .= " WHERE `device_id` = '" . $device['device_id'] . "'";
-    echo("Updating " . $device['hostname'] . " - $update_query \n");
-    $update_result = mysql_query($update_query);
-  } else {
-    echo("No Changes to " . $device['hostname'] . "\n");
-  }
   $i++;
   echo("\n");
   } else {
@@ -204,6 +195,16 @@ while ($device = mysql_fetch_array($device_query)) {
     mysql_query("INSERT INTO eventlog (host, interface, datetime, message) VALUES ('" . $device['device_id'] . "', NULL, NOW(), 'Device status changed to " . ($status == '1' ? 'Up' : 'Down') . "')");
   }
 
+  if ($update) {
+    $update_query  = "UPDATE `devices` SET ";
+    $update_query .= $update;
+    $update_query .= " WHERE `device_id` = '" . $device['device_id'] . "'";
+    echo("Updating " . $device['hostname'] . " - $update_query \n");
+    $update_result = mysql_query($update_query);
+  } else {
+    echo("No Changes to " . $device['hostname'] . "\n");
+  }
+
 }   
 
 $poller_end = utime(); $poller_run = $poller_end - $poller_start; $poller_time = substr($poller_run, 0, 5);