diff --git a/packages/modules/common/component_state.py b/packages/modules/common/component_state.py
index b2b27c970d..3a56202ea0 100644
--- a/packages/modules/common/component_state.py
+++ b/packages/modules/common/component_state.py
@@ -141,6 +141,9 @@ def __init__(self, soc: float, range: Optional[float] = None, soc_timestamp: Opt
         if soc_timestamp is None:
             self.soc_timestamp = timecheck.create_timestamp()
         else:
+            if soc_timestamp > 1e10:  # Convert soc_timestamp to seconds if it is in milliseconds
+                log.debug(f'Zeitstempel {soc_timestamp} ist in ms, wird in s gewandelt. Modul sollte angepasst werden.')
+                soc_timestamp /= 1000
             self.soc_timestamp = soc_timestamp
 
 
diff --git a/packages/modules/common/configurable_vehicle.py b/packages/modules/common/configurable_vehicle.py
index c30f280faa..a9ecba4f2c 100644
--- a/packages/modules/common/configurable_vehicle.py
+++ b/packages/modules/common/configurable_vehicle.py
@@ -76,6 +76,9 @@ def update(self, vehicle_update_data: VehicleUpdateData):
             if vehicle_update_data.soc_timestamp is None or vehicle_update_data.soc_timestamp < car_state.soc_timestamp:
                 # Nur wenn der SoC neuer ist als der bisherige, diesen setzen.
                 self.store.set(car_state)
+            elif vehicle_update_data.soc_timestamp > 1e10:
+                # car_state ist in ms geschrieben, dieser kann überschrieben werden
+                self.store.set(car_state)
             else:
                 log.debug("Not updating SoC, because timestamp is older.")