diff --git a/dns/rfc2136/Makefile b/dns/rfc2136/Makefile
index 0b739b189..ff070041e 100644
--- a/dns/rfc2136/Makefile
+++ b/dns/rfc2136/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		rfc2136
 PLUGIN_VERSION=		1.9
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		RFC-2136 Support
 PLUGIN_MAINTAINER=	franco@opnsense.org
 PLUGIN_DEPENDS=		bind-tools
diff --git a/dns/rfc2136/src/etc/inc/plugins.inc.d/rfc2136.inc b/dns/rfc2136/src/etc/inc/plugins.inc.d/rfc2136.inc
index fd9588e35..affb2fb46 100644
--- a/dns/rfc2136/src/etc/inc/plugins.inc.d/rfc2136.inc
+++ b/dns/rfc2136/src/etc/inc/plugins.inc.d/rfc2136.inc
@@ -91,19 +91,16 @@ function rfc2136_configure_do($verbose = false, $int = null, $updatehost = '', $
 {
     global $config;
 
-    if (!rfc2136_enabled()) {
+    if (!rfc2136_enabled() || !plugins_argument_map($int)) {
         return;
     }
 
-    /* $int is passed as an optional CSV so transform into empty array when not set */
-    $int = !empty($int) ? explode(',', $int) : [];
-
     service_log('Configuring RFC 2136 clients...', $verbose);
 
     foreach ($config['dnsupdates']['dnsupdate'] as $i => $dnsupdate) {
         if (!isset($dnsupdate['enable'])) {
             continue;
-        } elseif (count($int) && !in_array($dnsupdate['interface'], $int)) {
+        } elseif (!empty($int) && !in_array($dnsupdate['interface'], $int)) {
             continue;
         } elseif (!empty($updatehost) && ($updatehost != $dnsupdate['host'])) {
             continue;