diff --git a/projects/rocm-smi-lib/src/rocm_smi.cc b/projects/rocm-smi-lib/src/rocm_smi.cc
index 8d49b3702c..d698c813ef 100755
--- a/projects/rocm-smi-lib/src/rocm_smi.cc
+++ b/projects/rocm-smi-lib/src/rocm_smi.cc
@@ -2130,6 +2130,10 @@ rsmi_dev_temp_metric_get(uint32_t dv_ind, uint32_t sensor_type,
       mon_type = amd::smi::kMonInvalid;
   }
 
+  if (temperature == nullptr) {
+      return RSMI_STATUS_INVALID_ARGS;
+  }
+
   // The HBM temperature is retreived from the gpu_metrics
   if (sensor_type == RSMI_TEMP_TYPE_HBM_0
      || sensor_type == RSMI_TEMP_TYPE_HBM_1
@@ -2145,10 +2149,6 @@ rsmi_dev_temp_metric_get(uint32_t dv_ind, uint32_t sensor_type,
          return ret;
        }
 
-       if (temperature == nullptr) {
-          return RSMI_STATUS_INVALID_ARGS;
-       }
-
        switch (sensor_type) {
          case RSMI_TEMP_TYPE_HBM_0:
            val_ui16 = gpu_metrics.temperature_hbm[0];