diff --git a/projects/amdsmi/CHANGELOG.md b/projects/amdsmi/CHANGELOG.md
index dd4f7001c1..5c7f47af5e 100644
--- a/projects/amdsmi/CHANGELOG.md
+++ b/projects/amdsmi/CHANGELOG.md
@@ -141,8 +141,14 @@ GPU: 0
   - The new default for the `version` command is to display all the version information, including both amdgpu and amd_hsmp driver versions.
 
 ```shell
+amd-smi version
+AMDSMI Tool: 24.7.1+b446d6c-dirty | AMDSMI Library version: 24.7.2.0 | ROCm version: N/A | amdgpu version: 6.10.10 | amd_hsmp version: 2.2
+
 amd-smi version -g
-AMDSMI Tool: 24.7.1+6fa991c-dirty | AMDSMI Library version: 24.7.2.0 | ROCm version: N/A | amdgpu version: 6.12.2
+AMDSMI Tool: 24.7.1+b446d6c-dirty | AMDSMI Library version: 24.7.2.0 | ROCm version: N/A | amdgpu version: 6.10.10
+
+amd-smi version -c
+AMDSMI Tool: 24.7.1+b446d6c-dirty | AMDSMI Library version: 24.7.2.0 | ROCm version: N/A | amd_hsmp version: 2.2
 ```
 
 - **All `amd-smi set` and `amd-smi reset` options are now mutually exclusive**.  
diff --git a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
index 7f9f67637a..5347e99750 100644
--- a/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
+++ b/projects/amdsmi/amdsmi_cli/amdsmi_commands.py
@@ -112,7 +112,7 @@ class AMDSMICommands():
         if cpu_version:
             args.cpu_version = cpu_version
         # if no args are given, display everything
-        if not gpu_version and not cpu_version:
+        if not args.gpu_version and not args.cpu_version:
             args.gpu_version = True
             args.cpu_version = True
 
@@ -131,7 +131,7 @@ class AMDSMICommands():
         if args.gpu_version:
             try:
                 gpus = amdsmi_interface.amdsmi_get_processor_handles()
-                if isinstance(gpus, list):
+                if isinstance(gpus, list) and len(gpus) > 0:
                     gpu_version_info = amdsmi_interface.amdsmi_get_gpu_driver_info(gpus[0])
                     gpu_version_str = gpu_version_info['driver_version']
                 else:
@@ -142,9 +142,9 @@ class AMDSMICommands():
         if args.cpu_version:
             try:
                 cpus = amdsmi_interface.amdsmi_get_cpusocket_handles()
-                if isinstance(cpus, list):
-                    cpu_version_info = amdsmi_interface.amdsmi_get_amd_hsmp_driver_version(cpus[0])
-                    cpu_version_str = cpu_version_info['driver_version']
+                if isinstance(cpus, list) and len(cpus) > 0:
+                    cpu_version_info = amdsmi_interface.amdsmi_get_cpu_hsmp_driver_version(cpus[0])
+                    cpu_version_str = str(cpu_version_info['hsmp_driver_major_ver_num']) + "." + str(cpu_version_info['hsmp_driver_minor_ver_num'])
                 else:
                     cpu_version_str = "N/A"
             except amdsmi_exception.AmdSmiLibraryException as e:
@@ -158,7 +158,7 @@ class AMDSMICommands():
             if args.gpu_version:
                 human_readable_output = human_readable_output + f" | amdgpu version: {gpu_version_str}"
             if args.cpu_version:
-                human_readable_output = human_readable_output + f" | amd_hsmp driver version: {cpu_version_str}"
+                human_readable_output = human_readable_output + f" | amd_hsmp version: {cpu_version_str}"
             # Custom human readable handling for version
             if self.logger.destination == 'stdout':
                 print(human_readable_output)