diff --git a/src/yunohost/firewall.py b/src/yunohost/firewall.py
index 7b1c72170..0e1cf6e76 100644
--- a/src/yunohost/firewall.py
+++ b/src/yunohost/firewall.py
@@ -343,7 +343,8 @@ def firewall_upnp(action='status', no_refresh=False):
     # Refresh port mapping using UPnP
     if not no_refresh:
         upnpc = miniupnpc.UPnP()
-        upnpc.discoverdelay = 3000
+        upnpc.discoverdelay = 62000
+        upnpc.localport = 1900
 
         # Discover UPnP device(s)
         logger.debug('discovering UPnP devices...')