diff --git a/net/upnp/Makefile b/net/upnp/Makefile
index 9dca9a4c4..145438e56 100644
--- a/net/upnp/Makefile
+++ b/net/upnp/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		upnp
 PLUGIN_VERSION=		1.4
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_DEPENDS=		miniupnpd
 PLUGIN_COMMENT=		Universal Plug and Play Service
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
index 9c0caff43..f1d23f2e7 100644
--- a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
+++ b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc
@@ -148,9 +148,8 @@ function miniupnpd_configure_do($verbose = false)
             $if = get_real_interface($iface);
             /* above function returns iface if fail */
             if ($if != $iface) {
-                $addr = find_interface_ip($if);
-                /* check that the interface has an ip address before adding parameters */
-                if (is_ipaddr($addr)) {
+                list ($addr) = interfaces_primary_address($iface);
+                if (!empty($addr)) {
                     $config_text .= "listening_ip={$if}\n";
                     if (!$ifaces_active) {
                         $webgui_ip = $addr;