diff --git a/packages/modules/common/store/_chargepoint_internal.py b/packages/modules/common/store/_chargepoint_internal.py
index b4f3cc5560..a6acb53824 100644
--- a/packages/modules/common/store/_chargepoint_internal.py
+++ b/packages/modules/common/store/_chargepoint_internal.py
@@ -25,6 +25,7 @@ def update(self):
         pub_to_broker(f"{topic_prefix}/charge_state", self.state.charge_state, 2)
         pub_to_broker(f"{topic_prefix}/plug_state", self.state.plug_state, 2)
         pub_to_broker(f"{topic_prefix}/vehicle_id", self.state.vehicle_id)
+        pub_to_broker(f"{topic_prefix}/rfid", self.state.rfid)
         pub_to_broker(f"{topic_prefix}/serial_number", self.state.serial_number)
         pub_to_broker(f"{topic_prefix}/evse_current", self.state.evse_current, 2)
         pub_to_broker(f"{topic_prefix}/max_evse_current", self.state.max_evse_current, 2)
@@ -36,7 +37,6 @@ def update(self):
         if self.state.soc_timestamp is not None:
             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}/rfid", self.state.rfid)
             pub_to_broker(f"{topic_prefix}/rfid_timestamp", self.state.rfid_timestamp)