diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
index aa39625706836357c3fb30c7d075bf90728dbea4..ddb1a96a79fefe069c3edaae44c53a211fc97e30 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.cpp
@@ -130,7 +130,7 @@ namespace armarx::armem::server
 
     data::AddSegmentsResult ComponentPluginUser::addSegments(const data::AddSegmentsInput& input, bool addCoreSegments)
     {
-        std::scoped_lock lock(workingMemoryMutex);
+        // std::scoped_lock lock(workingMemoryMutex);
         data::AddSegmentsResult result = iceMemory.addSegments(input, addCoreSegments);
         return result;
     }
@@ -138,7 +138,7 @@ namespace armarx::armem::server
 
     data::CommitResult ComponentPluginUser::commit(const data::Commit& commitIce, const Ice::Current&)
     {
-        std::scoped_lock lock(workingMemoryMutex);
+        // std::scoped_lock lock(workingMemoryMutex);
         return iceMemory.commit(commitIce);
     }
 
@@ -146,7 +146,7 @@ namespace armarx::armem::server
     // READING
     armem::query::data::Result ComponentPluginUser::query(const armem::query::data::Input& input, const Ice::Current&)
     {
-        std::scoped_lock lock(workingMemoryMutex);
+        // std::scoped_lock lock(workingMemoryMutex);
         return iceMemory.query(input);
     }
 
@@ -154,7 +154,7 @@ namespace armarx::armem::server
     // LTM STORING
     data::StoreResult ComponentPluginUser::store(const data::StoreInput& input, const Ice::Current&)
     {
-        std::scoped_lock lock(workingMemoryMutex, longtermMemoryMutex);
+        std::scoped_lock lock(/*workingMemoryMutex,*/ longtermMemoryMutex);
         return iceMemory.store(input);
     }
 
diff --git a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
index c03668ea87b3b921f661129a0196b3f0486bf1fb..06ba31f7a128549f51be85de300a92bdd310cf95 100644
--- a/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
+++ b/source/RobotAPI/libraries/armem/server/ComponentPlugin.h
@@ -10,8 +10,8 @@
 
 #include <RobotAPI/libraries/armem/core/workingmemory/Memory.h>
 #include <RobotAPI/libraries/armem/core/longtermmemory/Memory.h>
-
 #include <RobotAPI/libraries/armem/client/MemoryNameSystemComponentPlugin.h>
+
 #include "MemoryToIceAdapter.h"
 
 
@@ -99,7 +99,8 @@ namespace armarx::armem::server
 
         /// The actual memory.
         wm::Memory workingMemory;
-        std::mutex workingMemoryMutex;
+        // [[deprecated ("The global working memory mutex is deprecated. Use the core segment mutexes instead.")]]
+        // std::mutex workingMemoryMutex;
 
         bool longtermMemoryEnabled = true;
         ltm::Memory longtermMemory;