diff --git a/packages/modules/internal_chargepoint_handler/pro_plus.py b/packages/modules/internal_chargepoint_handler/pro_plus.py
index 2798be3a93..19a6922563 100644
--- a/packages/modules/internal_chargepoint_handler/pro_plus.py
+++ b/packages/modules/internal_chargepoint_handler/pro_plus.py
@@ -27,7 +27,8 @@ def store_state(chargepoint_state: ChargepointState) -> None:
 
         try:
             chargepoint_state = super().request_values()
-            chargepoint_state.rfid = last_tag
+            if last_tag is not None and last_tag != "":
+                chargepoint_state.rfid = last_tag
         except (requests.exceptions.ConnectTimeout, requests.exceptions.ConnectionError):
             raise Exception("Interner Ladepunkt ist nicht erreichbar.")