diff --git a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.cpp b/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.cpp
index e4b2df5fc14dae323d90631b44f4a82eb97e795e..39439e2e77bbd8c3ebea44782ae44d62286c6ed9 100644
--- a/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.cpp
+++ b/source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateWriter.cpp
@@ -91,17 +91,16 @@ namespace armarx::armem::server::robot_state
                 Update update = buildUpdate(batch);
 
                 auto start = std::chrono::high_resolution_clock::now();
-                auto endLock = start, endProprioception = start, endLocalization = start;
+                auto endProprioception = start, endLocalization = start;
 
                 armem::CommitResult result;
                 {
-                    endLock = std::chrono::high_resolution_clock::now();
+                    // Commits lock the core segments.
 
-                    // Commits locks the core segment.
-                    result = memory.commit(update.proprioception);
+                    result = memory.commitLocking(update.proprioception);
                     endProprioception = std::chrono::high_resolution_clock::now();
 
-                    localizationSegment.storeTransform(update.localization);
+                    localizationSegment.commitTransformLocking(update.localization);
                     endLocalization = std::chrono::high_resolution_clock::now();
                 }
                 if (not result.allSuccess())
@@ -113,8 +112,7 @@ namespace armarx::armem::server::robot_state
                     auto end = std::chrono::high_resolution_clock::now();
 
                     debugObserver->setDebugObserverDatafield("RobotStateWriter | t Commit [ms]", toDurationMs(start, end));
-                    debugObserver->setDebugObserverDatafield("RobotStateWriter | t Commit Lock [ms]", toDurationMs(start, endLock));
-                    debugObserver->setDebugObserverDatafield("RobotStateWriter | t Commit Proprioception [ms]", toDurationMs(endLock, endProprioception));
+                    debugObserver->setDebugObserverDatafield("RobotStateWriter | t Commit Proprioception [ms]", toDurationMs(start, endProprioception));
                     debugObserver->setDebugObserverDatafield("RobotStateWriter | t Commit Localization [ms]", toDurationMs(endProprioception, endLocalization));
                 }
             }