diff --git a/files/image_config/hostcfgd/hostcfgd b/files/image_config/hostcfgd/hostcfgd
index 4ac3be83d06e..0f7fe8b0ea63 100755
--- a/files/image_config/hostcfgd/hostcfgd
+++ b/files/image_config/hostcfgd/hostcfgd
@@ -267,39 +267,42 @@ class HostConfigDaemon:
         for key in status_data.keys():
             if not key:
                 syslog.syslog(syslog.LOG_WARNING, "FEATURE key is missing")
-                return
-        status = status_data[key]['status']
-        if not status:
-            syslog.syslog(syslog.LOG_WARNING, "status is missing for {}".format(key))
-            return
-        if status == "enabled":
-            start_cmds=[]
-            start_cmds.append("sudo systemctl enable {}".format(key))
-            start_cmds.append("sudo systemctl start {}".format(key))
-            for cmd in start_cmds:
-                syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
-                try:
-                    subprocess.check_call(cmd, shell=True)
-                except subprocess.CalledProcessError as err:
-                    syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
-                              .format(err.cmd, err.returncode, err.output))
-                    return
-            syslog.syslog(syslog.LOG_INFO, "Feature '{}' is enabled and started".format(key))
-        elif status == "disabled":
-            stop_cmds=[]
-            stop_cmds.append("sudo systemctl stop {}".format(key))
-            stop_cmds.append("sudo systemctl disable {}".format(key))
-            for cmd in stop_cmds:
-                syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
-                try:
-                    subprocess.check_call(cmd, shell=True)
-                except subprocess.CalledProcessError as err:
-                    syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
-                              .format(err.cmd, err.returncode, err.output))
-                    return
-            syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(key))
-        else:
-            syslog.syslog(syslog.LOG_ERR, "Unexpected status value '{}' for '{}'".format(status, key))
+                continue
+
+            status = status_data[key]['status']
+            if not status:
+                syslog.syslog(syslog.LOG_WARNING, "status is missing for {}".format(key))
+                continue
+            if status == "enabled":
+                start_cmds=[]
+                start_cmds.append("sudo systemctl unmask {}.service".format(key))
+                start_cmds.append("sudo systemctl enable {}.service".format(key))
+                start_cmds.append("sudo systemctl start {}.service".format(key))
+                for cmd in start_cmds:
+                    syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
+                    try:
+                        subprocess.check_call(cmd, shell=True)
+                    except subprocess.CalledProcessError as err:
+                        syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
+                                  .format(err.cmd, err.returncode, err.output))
+                        continue
+                syslog.syslog(syslog.LOG_INFO, "Feature '{}' is enabled and started".format(key))
+            elif status == "disabled":
+                stop_cmds=[]
+                stop_cmds.append("sudo systemctl stop {}.service".format(key))
+                stop_cmds.append("sudo systemctl disable {}.service".format(key))
+                stop_cmds.append("sudo systemctl mask {}.service".format(key))
+                for cmd in stop_cmds:
+                    syslog.syslog(syslog.LOG_INFO, "Running cmd - {}".format(cmd))
+                    try:
+                        subprocess.check_call(cmd, shell=True)
+                    except subprocess.CalledProcessError as err:
+                        syslog.syslog(syslog.LOG_ERR, "{} - failed: return code - {}, output:\n{}"
+                                  .format(err.cmd, err.returncode, err.output))
+                        continue
+                syslog.syslog(syslog.LOG_INFO, "Feature '{}' is stopped and disabled".format(key))
+            else:
+                syslog.syslog(syslog.LOG_ERR, "Unexpected status value '{}' for '{}'".format(status, key))
 
     def start(self):
         self.config_db.subscribe('AAA', lambda table, key, data: self.aaa_handler(key, data))