diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py
index 5f28c4a172..536f37928b 100644
--- a/amdsmi_cli/amdsmi_commands.py
+++ b/amdsmi_cli/amdsmi_commands.py
@@ -1124,14 +1124,14 @@ class AMDSMICommands():
                 args.temperature = temperature
             if ecc:
                 args.ecc = ecc
-            if pcie:
-                args.pcie = pcie
-            current_platform_args += ["usage", "power", "clock", "temperature", "ecc", "pcie"]
-            current_platform_values += [args.usage, args.power, args.clock, args.temperature, args.ecc, args.pcie]
-
-        if self.helpers.is_baremetal() and self.helpers.is_linux():
             if ecc_blocks:
                 args.ecc_blocks = ecc_blocks
+            if pcie:
+                args.pcie = pcie
+            current_platform_args += ["usage", "power", "clock", "temperature", "ecc", "ecc_blocks", "pcie"]
+            current_platform_values += [args.usage, args.power, args.clock, args.temperature, args.ecc, args.ecc_blocks, args.pcie]
+
+        if self.helpers.is_baremetal() and self.helpers.is_linux():
             if fan:
                 args.fan = fan
             if voltage_curve:
@@ -1144,8 +1144,8 @@ class AMDSMICommands():
                 args.xgmi_err = xgmi_err
             if energy:
                 args.energy = energy
-            current_platform_args += ["ecc_blocks", "fan", "voltage_curve", "overdrive", "perf_level", "xgmi_err", "energy"]
-            current_platform_values += [args.ecc_blocks, args.fan, args.voltage_curve, args.overdrive, args.perf_level, args.xgmi_err, args.energy]
+            current_platform_args += ["fan", "voltage_curve", "overdrive", "perf_level", "xgmi_err", "energy"]
+            current_platform_values += [args.fan, args.voltage_curve, args.overdrive, args.perf_level, args.xgmi_err, args.energy]
 
         if self.helpers.is_hypervisor():
             if schedule:
diff --git a/amdsmi_cli/amdsmi_parser.py b/amdsmi_cli/amdsmi_parser.py
index 3140cd52a0..ab283d9c13 100644
--- a/amdsmi_cli/amdsmi_parser.py
+++ b/amdsmi_cli/amdsmi_parser.py
@@ -759,10 +759,10 @@ class AMDSMIParser(argparse.ArgumentParser):
                 metric_parser.add_argument('-t', '--temperature', action='store_true', required=False, help=temperature_help)
                 metric_parser.add_argument('-P', '--pcie', action='store_true', required=False, help=pcie_help)
                 metric_parser.add_argument('-e', '--ecc', action='store_true', required=False, help=ecc_help)
+                metric_parser.add_argument('-k', '--ecc-blocks', action='store_true', required=False, help=ecc_blocks_help)
 
             # Optional Args for Linux Baremetal Systems
             if self.helpers.is_baremetal() and self.helpers.is_linux():
-                metric_parser.add_argument('-k', '--ecc-blocks', action='store_true', required=False, help=ecc_blocks_help)
                 metric_parser.add_argument('-f', '--fan', action='store_true', required=False, help=fan_help)
                 metric_parser.add_argument('-C', '--voltage-curve', action='store_true', required=False, help=vc_help)
                 metric_parser.add_argument('-o', '--overdrive', action='store_true', required=False, help=overdrive_help)