diff --git a/dbus-sdr/sensorcommands.cpp b/dbus-sdr/sensorcommands.cpp
index c57a1a2..ad81fd8 100644
--- a/dbus-sdr/sensorcommands.cpp
+++ b/dbus-sdr/sensorcommands.cpp
@@ -2190,6 +2190,15 @@
     {
         auto& ipmiDecoratorPaths = getIpmiDecoratorPaths(ctx);
 
+        if (ctx->lun == 1)
+        {
+            recordID += maxSensorsPerLUN;
+        }
+        else if (ctx->lun == 3)
+        {
+            recordID += maxSensorsPerLUN * 2;
+        }
+
         // Count the number of Type 1 SDR entries assigned to the LUN
         while (!getSensorDataRecord(
             ctx, ipmiDecoratorPaths.value_or(std::unordered_set<std::string>()),
@@ -2223,12 +2232,19 @@
                     sdrCount++;
                 }
             }
-            else if (hdr->record_type == get_sdr::SENSOR_DATA_FRU_RECORD)
+            else if (hdr->record_type == get_sdr::SENSOR_DATA_FRU_RECORD ||
+                     hdr->record_type == get_sdr::SENSOR_DATA_MGMT_CTRL_LOCATOR)
             {
                 sdrCount++;
             }
+
+            // Because response count data is 1 byte, so sdrCount need to avoid
+            // overflow.
+            if (sdrCount == maxSensorsPerLUN)
+            {
+                break;
+            }
         }
-        sdrCount += ipmi::storage::type12Count;
     }
     else if (count.value_or(0) == getSensorCount)
     {
diff --git a/sensorhandler.hpp b/sensorhandler.hpp
index 43ed82f..357ade4 100644
--- a/sensorhandler.hpp
+++ b/sensorhandler.hpp
@@ -191,8 +191,9 @@
     SENSOR_DATA_FULL_RECORD = 0x1,
     SENSOR_DATA_COMPACT_RECORD = 0x2,
     SENSOR_DATA_EVENT_RECORD = 0x3,
-    SENSOR_DATA_FRU_RECORD = 0x11,
     SENSOR_DATA_ENTITY_RECORD = 0x8,
+    SENSOR_DATA_FRU_RECORD = 0x11,
+    SENSOR_DATA_MGMT_CTRL_LOCATOR = 0x12,
 };
 
 // Record key