diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php
index 81544c6ea0..55053edf67 100644
--- a/includes/polling/functions.inc.php
+++ b/includes/polling/functions.inc.php
@@ -243,11 +243,20 @@ function poll_device($device, $force_module = false)
     echo 'Hostname:    ' . $device['hostname'] . PHP_EOL;
     echo 'Device ID:   ' . $device['device_id'] . PHP_EOL;
     echo 'OS:          ' . $device['os'] . PHP_EOL;
-    $ip = dnslookup($device);
+
+    if (empty($device['overwrite_ip'])) {
+        $ip = dnslookup($device);
+    } else {
+        $ip = $device['overwrite_ip'];
+    }
 
     $db_ip = null;
     if (!empty($ip)) {
-        echo 'Resolved IP: '.$ip.PHP_EOL;
+        if (empty($device['overwrite_ip'])) {
+            echo 'Resolved IP: '.$ip.PHP_EOL;
+        } else {
+            echo 'Assigned IP: '.$ip.PHP_EOL;
+        }
         $db_ip = inet_pton($ip);
     }