diff --git a/bec_lib/bec_lib/config_helper.py b/bec_lib/bec_lib/config_helper.py
index 88c65f0b..386dd070 100644
--- a/bec_lib/bec_lib/config_helper.py
+++ b/bec_lib/bec_lib/config_helper.py
@@ -9,9 +9,9 @@ import msgpack
 import yaml
 
 from bec_lib.bec_errors import DeviceConfigError
-from bec_lib.messages import DeviceConfigMessage, RequestResponseMessage
 from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
+from bec_lib.messages import DeviceConfigMessage, RequestResponseMessage
 
 if TYPE_CHECKING:
     from bec_lib.redis_connector import RedisConnector
@@ -64,6 +64,7 @@ class ConfigHelper:
             dev.pop("createdAt", None)
             dev.pop("createdBy", None)
             dev.pop("sessionId", None)
+            name = dev.pop("name")
             enabled = dev.pop("enabled", None)
             config = {"status": {"enabled": enabled}}
 
@@ -71,7 +72,7 @@ class ConfigHelper:
             if enabled_set is not None:
                 config["status"]["enabled_set"] = enabled_set
             config.update(dev)
-            out[dev["name"]] = config
+            out[name] = config
 
         with open(file_path, "w") as file:
             file.write(yaml.dump(out))
diff --git a/bec_lib/tests/test_config_helper.py b/bec_lib/tests/test_config_helper.py
index 601fc800..a557f466 100644
--- a/bec_lib/tests/test_config_helper.py
+++ b/bec_lib/tests/test_config_helper.py
@@ -87,7 +87,6 @@ def test_config_helper_save_current_session():
         config_helper.save_current_session("test.yaml")
         out_data = {
             "pinz": {
-                "name": "pinz",
                 "deviceClass": "SynAxisOPAAS",
                 "deviceTags": ["user motors"],
                 "status": {"enabled": True, "enabled_set": True},
@@ -108,7 +107,6 @@ def test_config_helper_save_current_session():
                 "onFailure": "retry",
             },
             "transd": {
-                "name": "transd",
                 "deviceClass": "SynAxisMonitor",
                 "deviceTags": ["beamline"],
                 "status": {"enabled": True, "enabled_set": True},