diff --git a/packages/control/bat.py b/packages/control/bat.py
index 2052de16f7..f3ae1e7d9f 100644
--- a/packages/control/bat.py
+++ b/packages/control/bat.py
@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 import logging
-from typing import List
+from typing import List, Optional
 
 from dataclass_utils.factories import currents_list_factory
 from helpermodules.constants import NO_ERROR
@@ -41,7 +41,7 @@ def get_factory() -> Get:
 
 @dataclass
 class Set:
-    power_limit: float = field(default=None, metadata={"topic": "set/power_limit"})
+    power_limit: Optional[int] = field(default=None, metadata={"topic": "set/power_limit"})
 
 
 def set_factory() -> Set:
diff --git a/packages/control/bat_all.py b/packages/control/bat_all.py
index 49c627e26d..353aad0c50 100644
--- a/packages/control/bat_all.py
+++ b/packages/control/bat_all.py
@@ -279,8 +279,8 @@ def _set_bat_power_active_control(self, power):
                     # setze Entladeleistung als Bruchteil der möglichen Entladeleistung
                     else:
                         factor = min(power / max_discharge_power_total, 1)
-                        power_limit = bat_component_data.get.max_discharge_power * factor
-                        bat_component_data.get.state_str = f"Entladung mit {power_limit}W"
+                        power_limit = int(bat_component_data.get.max_discharge_power * factor)
+                        bat_component_data.get.state_str = f"Entladung mit {round(power_limit / 1000, 3)} kW"
                         log.debug(("Aktive Speichersteuerung: Entladung - "
                                    f"Speicher (ID: {bat_component.component_config.id}) "
                                    f"entlädt mit {power_limit} ({factor} x "
@@ -296,8 +296,8 @@ def _set_bat_power_active_control(self, power):
                                "befindet sich oberhalb maximal SoC - Speicher sperren."))
                 else:
                     factor = min(power / max_charge_power_total, 1)
-                    power_limit = bat_component_data.get.max_charge_power * factor
-                    bat_component_data.get.state_str = f"Ladung mit {power_limit}W "
+                    power_limit = int(bat_component_data.get.max_charge_power * factor)
+                    bat_component_data.get.state_str = f"Ladung mit {round(power_limit / 1000, 3)} kW "
                     log.debug(("Aktive Speichersteuerung: Ladung - "
                                f"Speicher (ID: {bat_component.component_config.id}) "
                                f"lädt mit {power_limit} ({factor} x {bat_component_data.get.max_charge_power})"))