diff --git a/yunohost_firewall.py b/yunohost_firewall.py
index 57bdd789..ceeaa1cc 100644
--- a/yunohost_firewall.py
+++ b/yunohost_firewall.py
@@ -250,3 +250,5 @@ def firewall_stop():
     os.system ("ip6tables -P INPUT ACCEPT")
     os.system ("ip6tables -F")
     os.system ("ip6tables -X")
+
+    firewall_removeupnp()