diff --git a/plinth/modules/firewall/__init__.py b/plinth/modules/firewall/__init__.py
index c2e126cbb..846423891 100644
--- a/plinth/modules/firewall/__init__.py
+++ b/plinth/modules/firewall/__init__.py
@@ -23,6 +23,7 @@ from django.utils.translation import ugettext_lazy as _
 from plinth import actions
 from plinth import app as app_module
 from plinth import cfg, menu
+from plinth.daemon import Daemon
 from plinth.utils import Version, format_lazy
 
 from .manifest import backup  # noqa, pylint: disable=unused-import
@@ -33,6 +34,8 @@ is_essential = True
 
 managed_packages = ['firewalld', 'nftables']
 
+managed_services = ['firewalld']
+
 name = _('Firewall')
 
 description = [
@@ -62,6 +65,9 @@ class FirewallApp(app_module.App):
                               'firewall:index', parent_url_name='system')
         self.add(menu_item)
 
+        daemon = Daemon('daemon-firewall', managed_services[0])
+        self.add(daemon)
+
 
 def init():
     """Initailze firewall module"""