diff --git a/html/pages/device/edit/misc.inc.php b/html/pages/device/edit/misc.inc.php
index 5f66c88fd..8a38293ed 100644
--- a/html/pages/device/edit/misc.inc.php
+++ b/html/pages/device/edit/misc.inc.php
@@ -2,6 +2,12 @@
 
 echo '
 <form class="form-horizontal">
+    <div class="form-group">
+        <label for="oxidized" class="col-sm-2 control-label">Disable ICMP Test?</label>
+        <div class="col-sm-10">
+            '.dynamic_override_config('checkbox','override_icmp_disable', $device).'
+        </div>
+    </div>
     <div class="form-group">
         <label for="oxidized" class="col-sm-2 control-label">Exclude from Oxidized?</label>
         <div class="col-sm-10">
diff --git a/includes/functions.php b/includes/functions.php
index ba4aeb30a..1da63d4e8 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -490,7 +490,8 @@ function isSNMPable($device) {
 function isPingable($hostname, $address_family = AF_INET, $device_id = FALSE) {
     global $config;
 
-    if ($config['icmp_check'] === true) {
+    $tmp_device = array('device_id'=>$device_id);
+    if ($config['icmp_check'] === true || get_dev_attrib($tmp_device,'override_icmp_disable') != "true") {
 
         $fping_params = '';
         if(is_numeric($config['fping_options']['retries']) || $config['fping_options']['retries'] > 1) {