diff --git a/packages/modules/devices/good_we/good_we/bat.py b/packages/modules/devices/good_we/good_we/bat.py
index 9116220b99..c9fc003cf2 100644
--- a/packages/modules/devices/good_we/good_we/bat.py
+++ b/packages/modules/devices/good_we/good_we/bat.py
@@ -26,6 +26,7 @@ def __init__(self, component_config: GoodWeBatSetup, **kwargs: Any) -> None:
         self.kwargs: KwargsDict = kwargs
 
     def initialize(self) -> None:
+        self.__device_id: int = self.kwargs['device_id']
         self.__modbus_id: int = self.kwargs['modbus_id']
         self.version: GoodWeVersion = self.kwargs['version']
         self.firmware: int = self.kwargs['firmware']
@@ -50,8 +51,8 @@ def update(self) -> None:
                 exported = self.__tcp_client.read_holding_registers(
                     35209, ModbusDataType.UINT_32, unit=self.__modbus_id) * 100
             else:
-                power = self.__tcp_client.read_holding_registers(35182, ModbusDataType.INT_32, unit=self.__modbus_id)*-1
-                soc = self.__tcp_client.read_holding_registers(37007, ModbusDataType.UINT_16, unit=self.__modbus_id)
+                power = self.__tcp_client.read_holding_registers(35264, ModbusDataType.INT_32, unit=self.__modbus_id)*-1
+                soc = self.__tcp_client.read_holding_registers(39005, ModbusDataType.UINT_16, unit=self.__modbus_id)
                 imported, exported = self.sim_counter.sim_count(power)
 
         bat_state = BatState(
diff --git a/packages/modules/devices/good_we/good_we/device.py b/packages/modules/devices/good_we/good_we/device.py
index e4ff4db18e..266b0fb046 100644
--- a/packages/modules/devices/good_we/good_we/device.py
+++ b/packages/modules/devices/good_we/good_we/device.py
@@ -22,6 +22,7 @@ def create_device(device_config: GoodWe):
     def create_bat_component(component_config: GoodWeBatSetup):
         nonlocal client
         return bat.GoodWeBat(component_config=component_config,
+                             device_id=device_config.id,
                              modbus_id=device_config.configuration.modbus_id,
                              version=GoodWeVersion(device_config.configuration.version),
                              firmware=device_config.configuration.firmware,