diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py
index 7d25643bba43..c45a931e0553 100755
--- a/dockers/docker-orchagent/enable_counters.py
+++ b/dockers/docker-orchagent/enable_counters.py
@@ -38,16 +38,18 @@ def enable_rates():
 def enable_counters():
     db = swsssdk.ConfigDBConnector()
     db.connect()
-    enable_counter_group(db, 'PORT')
-    enable_counter_group(db, 'RIF')
-    enable_counter_group(db, 'QUEUE')
-    enable_counter_group(db, 'PFCWD')
-    enable_counter_group(db, 'PG_WATERMARK')
-    enable_counter_group(db, 'PG_DROP')
-    enable_counter_group(db, 'QUEUE_WATERMARK')
-    enable_counter_group(db, 'BUFFER_POOL_WATERMARK')
-    enable_counter_group(db, 'PORT_BUFFER_DROP')
-    enable_counter_group(db, 'ACL')
+    default_enabled_counters = ['PORT', 'RIF', 'QUEUE', 'PFCWD', 'PG_WATERMARK', 'PG_DROP', 
+                                'QUEUE_WATERMARK', 'BUFFER_POOL_WATERMARK', 'PORT_BUFFER_DROP', 'ACL']
+    
+    # Enable those default counters
+    for key in default_enabled_counters:
+        enable_counter_group(db, key)
+
+    # Set FLEX_COUNTER_DELAY_STATUS to false for those non-default counters
+    keys = db.get_keys('FLEX_COUNTER_TABLE')
+    for key in keys:
+        if key not in default_enabled_counters:
+            enable_counter_group(db, key)
     enable_rates()