diff --git a/src/sonic-host-services/scripts/hostcfgd b/src/sonic-host-services/scripts/hostcfgd
index 3145b819d356..51579430398f 100755
--- a/src/sonic-host-services/scripts/hostcfgd
+++ b/src/sonic-host-services/scripts/hostcfgd
@@ -312,7 +312,7 @@ class HostConfigDaemon:
 
     def update_all_feature_states(self):
         feature_table = self.config_db.get_table('FEATURE')
-        for feature_name in list(feature_table.keys()):
+        for feature_name in feature_table:
             if not feature_name:
                 syslog.syslog(syslog.LOG_WARNING, "Feature is None")
                 continue
@@ -358,7 +358,7 @@ class HostConfigDaemon:
     def feature_state_handler(self, key, data):
         feature_name = key
         feature_table = self.config_db.get_table('FEATURE')
-        if feature_name not in list(feature_table.keys()):
+        if feature_name not in feature_table:
             syslog.syslog(syslog.LOG_WARNING, "Feature '{}' not in FEATURE table".format(feature_name))
             return