diff --git a/packages/control/chargelog/chargelog.py b/packages/control/chargelog/chargelog.py
index b8605e058d..c9c7549076 100644
--- a/packages/control/chargelog/chargelog.py
+++ b/packages/control/chargelog/chargelog.py
@@ -180,8 +180,9 @@ def save_data(chargepoint, charging_ev, immediately: bool = True):
         imported_at_mode_switch notiert. Sonst schon, damit zwischen save_data und dem nächsten collect_data keine
         Daten verloren gehen.
     """
-    new_entry = _create_entry(chargepoint, charging_ev, immediately)
-    write_new_entry(new_entry)
+    if chargepoint.data.set.log.imported_since_mode_switch != 0:
+        new_entry = _create_entry(chargepoint, charging_ev, immediately)
+        write_new_entry(new_entry)
 
 
 def _create_entry(chargepoint, charging_ev, immediately: bool = True):
diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py
index f06e68960a..fb49fc0dad 100644
--- a/packages/control/chargepoint/chargepoint.py
+++ b/packages/control/chargepoint/chargepoint.py
@@ -731,7 +731,7 @@ def update(self, ev_list: Dict[str, Ev]) -> None:
                     message = message_ev if message_ev else message
                     # Ein Eintrag muss nur erstellt werden, wenn vorher schon geladen wurde und auch danach noch
                     # geladen werden soll.
-                    if self.chargemode_changed and self.data.set.log.imported_since_mode_switch != 0 and state:
+                    if self.chargemode_changed and state:
                         chargelog.save_interim_data(self, charging_ev)
 
                     # Wenn die Nachrichten gesendet wurden, EV wieder löschen, wenn das EV im Algorithmus nicht