diff --git a/class/core/firewall_api.py b/class/core/firewall_api.py
index 10a930d87..bc55d0170 100755
--- a/class/core/firewall_api.py
+++ b/class/core/firewall_api.py
@@ -289,6 +289,7 @@ class firewall_api:
                 return
             if self.__isFirewalld:
                 public.execShell('systemctl stop firewalld.service')
+                public.execShell('systemctl disabled firewalld.service')
             elif self.__isMac:
                 pass
             else:
@@ -300,6 +301,7 @@ class firewall_api:
                 return
             if self.__isFirewalld:
                 public.execShell('systemctl start firewalld.service')
+                public.execShell('systemctl enable firewalld.service')
             elif self.__isMac:
                 pass
             else: