diff --git a/rocm_smi/src/rocm_smi_monitor.cc b/rocm_smi/src/rocm_smi_monitor.cc
index 866862d621..5d37b8a849 100644
--- a/rocm_smi/src/rocm_smi_monitor.cc
+++ b/rocm_smi/src/rocm_smi_monitor.cc
@@ -336,7 +336,11 @@ Monitor::setTempSensorLabelMap(void) {
     return 0;
   };
 
-  for (uint32_t i = RSMI_TEMP_TYPE_FIRST; i <= RSMI_TEMP_TYPE_LAST; ++i) {
+  for (uint32_t t = RSMI_TEMP_TYPE_FIRST; t <= RSMI_TEMP_TYPE_LAST; ++t) {
+    temp_type_index_map_.insert(
+       {static_cast<rsmi_temperature_type_t>(t), RSMI_TEMP_TYPE_INVALID});
+  }
+  for (uint32_t i = 1; i <= RSMI_TEMP_TYPE_LAST + 1; ++i) {
     if ((i <= RSMI_TEMP_TYPE_GENERAL_LAST) ||
         (i >= RSMI_TEMP_TYPE_GPUBOARD_NODE_FIRST && i <= RSMI_TEMP_TYPE_GPUBOARD_NODE_LAST) ||
         (i >= RSMI_TEMP_TYPE_GPUBOARD_VR_FIRST && i <= RSMI_TEMP_TYPE_GPUBOARD_LAST) ||
@@ -345,9 +349,6 @@ Monitor::setTempSensorLabelMap(void) {
           if (ret) {
             return ret;
           }
-    } else {
-      temp_type_index_map_.insert(
-        {static_cast<rsmi_temperature_type_t>(i), RSMI_TEMP_TYPE_INVALID});
     }
   }
   return 0;