diff --git a/src/etc/inc/plugins.inc.d/dpinger.inc b/src/etc/inc/plugins.inc.d/dpinger.inc
index d32231411..0357ffb39 100644
--- a/src/etc/inc/plugins.inc.d/dpinger.inc
+++ b/src/etc/inc/plugins.inc.d/dpinger.inc
@@ -42,7 +42,7 @@ function dpinger_services()
     }
 
     foreach ($config['gateways']['gateway_item'] as $gateway) {
-        if (isset($gateway['monitor_disable']) && $gateway['monitor_disable'] != '0') {
+        if (!empty($gateway['monitor_disable']) || isset($gateway['disabled'])) {
             continue;
         }