diff --git a/firewall.py b/firewall.py
index b5c2a478d..c2d52015e 100644
--- a/firewall.py
+++ b/firewall.py
@@ -207,7 +207,7 @@ def firewall_upnp(action=None):
     Add uPnP cron and enable uPnP in firewall.yml, or the opposite.
 
     Keyword argument:
-        action -- enable/disable
+        action -- enable/disable/check
 
     """
     firewall = firewall_list(raw=True)
@@ -244,6 +244,13 @@ def firewall_upnp(action=None):
 
         msignals.display(m18n.n('upnp_disabled'), 'success')
 
+    if action == 'check':
+        if firewall['uPnP']['enabled'] == True:
+            msignals.display(m18n.n('upnp_active'), 'success')
+        else:
+            raise MoulinetteError(errno.EPERM,
+                              m18n.n('upnp_inactive'))
+            
     if action:
         os.system("cp /etc/yunohost/firewall.yml /etc/yunohost/firewall.yml.old")
         with open('/etc/yunohost/firewall.yml', 'w') as f: