diff --git a/Software/MODBUS-LUNA2000.h b/Software/MODBUS-LUNA2000.h
index d0d75d87..28829d2d 100644
--- a/Software/MODBUS-LUNA2000.h
+++ b/Software/MODBUS-LUNA2000.h
@@ -2,7 +2,7 @@
 #define MODBUS_LUNA2000_H
 #include <Arduino.h>
 
-#define MB_RTU_NUM_VALUES 30000
+#define MB_RTU_NUM_VALUES 50000
 // Definitions for BMS status
 #define STANDBY 0
 #define INACTIVE 1
diff --git a/Software/Software.ino b/Software/Software.ino
index 18bfa1c0..d97d8ba4 100644
--- a/Software/Software.ino
+++ b/Software/Software.ino
@@ -32,8 +32,13 @@ unsigned long previousMillis10ms = 50;
 unsigned long previousMillisInverter = 0; 
 
 //ModbusRTU parameters
-#if defined(MODBUS_BYD) || defined(MODBUS_LUNA2000)
+#if defined(MODBUS_BYD)
 #define MB_RTU_NUM_VALUES 30000
+#endif
+#if defined(MODBUS_LUNA2000)
+#define MB_RTU_NUM_VALUES 50000
+#endif
+#if defined(MODBUS_BYD) || defined(MODBUS_LUNA2000)
 uint16_t mbPV[MB_RTU_NUM_VALUES];  // process variable memory
 // Create a ModbusRTU server instance listening on Serial2 with 2000ms timeout
 ModbusServerRTU MBserver(Serial2, 2000);