diff --git a/packages/modules/chargepoints/smartwb/smartwb_test.py b/packages/modules/chargepoints/smartwb/smartwb_test.py
index 0a5f04ba57..2ac20b1e20 100644
--- a/packages/modules/chargepoints/smartwb/smartwb_test.py
+++ b/packages/modules/chargepoints/smartwb/smartwb_test.py
@@ -61,7 +61,6 @@ class TestSmartWb:
         plug_state=True,
         charge_state=True,
         rfid="0a1b2c3d",
-        rfid_timestamp=1652683252,
         serial_number="94:B9:7E:69:F0:D1",
         max_evse_current=16
     )
@@ -100,7 +99,6 @@ class TestSmartWb:
         plug_state=True,
         charge_state=True,
         rfid="0a1b2c3d",
-        rfid_timestamp=1652683252,
         phases_in_use=None,
         serial_number="94:B9:7E:69:F0:D1",
         max_evse_current=16
diff --git a/packages/modules/common/component_state.py b/packages/modules/common/component_state.py
index c3e308e681..0df12c4c6f 100644
--- a/packages/modules/common/component_state.py
+++ b/packages/modules/common/component_state.py
@@ -197,10 +197,7 @@ def __init__(self,
         self.charge_state = charge_state
         self.plug_state = plug_state
         self.rfid = rfid
-        if self.rfid and rfid_timestamp is None:
-            self.rfid_timestamp = timecheck.create_timestamp()
-        else:
-            self.rfid_timestamp = rfid_timestamp
+        self.rfid_timestamp = rfid_timestamp
         if _check_none(power_factors):
             power_factors = [0.0]*3
         self.charging_current = charging_current
diff --git a/packages/modules/common/store/_chargepoint.py b/packages/modules/common/store/_chargepoint.py
index d630eb7b92..0aa92624e7 100644
--- a/packages/modules/common/store/_chargepoint.py
+++ b/packages/modules/common/store/_chargepoint.py
@@ -48,7 +48,8 @@ def update(self):
         pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/charge_state", self.state.charge_state, 2)
         pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/plug_state", self.state.plug_state, 2)
         pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/rfid", self.state.rfid)
-        pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/rfid_timestamp", self.state.rfid_timestamp)
+        if self.state.rfid_timestamp is not None:
+            pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/rfid_timestamp", self.state.rfid_timestamp)
         pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/serial_number", self.state.serial_number)
         pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/soc", self.state.soc)
         pub_to_broker("openWB/set/chargepoint/" + str(self.num) + "/get/soc_timestamp", self.state.soc_timestamp)
diff --git a/packages/modules/common/store/_chargepoint_internal.py b/packages/modules/common/store/_chargepoint_internal.py
index 58e2aafa13..d16e821742 100644
--- a/packages/modules/common/store/_chargepoint_internal.py
+++ b/packages/modules/common/store/_chargepoint_internal.py
@@ -37,6 +37,7 @@ def update(self):
             pub_to_broker(f"{topic_prefix}/soc_timestamp", self.state.soc_timestamp)
         if self.state.rfid_timestamp is not None:
             pub_to_broker(f"{topic_prefix}/vehicle_id", self.state.vehicle_id)
+            pub_to_broker(f"{topic_prefix}/rfid_timestamp", self.state.rfid_timestamp)
 
 
 def get_internal_chargepoint_value_store(id: int) -> ValueStore[ChargepointState]: