diff --git a/source/armarx/navigation/client/ComponentPlugin.cpp b/source/armarx/navigation/client/ComponentPlugin.cpp
index 6266c680f8fb74e54b51735bb07310fb09b1a94c..368ca6495f189e7263bc654a5e66816a72ae1bfa 100644
--- a/source/armarx/navigation/client/ComponentPlugin.cpp
+++ b/source/armarx/navigation/client/ComponentPlugin.cpp
@@ -57,7 +57,7 @@ armarx::navigation::client::ComponentPlugin::configureNavigator(
 {
     ARMARX_TRACE;
 
-    ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!";
+    // ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!";
 
     eventHandler = [&]() -> std::unique_ptr<SimpleEventHandler>
     {
@@ -88,9 +88,7 @@ armarx::navigation::client::ComponentPlugin::configureNavigator(
 {
     ARMARX_TRACE;
 
-    ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!";
-
-    eventHandler = std::make_unique<MemorySubscriber>(configId, memoryNameSystem);
+    // ARMARX_CHECK_NULL(eventHandler) << "`configureNavigator()` can only be called once!";
 
     iceNavigator.createConfig(stackConfig, configId);
 
diff --git a/source/armarx/navigation/client/ComponentPlugin.h b/source/armarx/navigation/client/ComponentPlugin.h
index f41322c3e3d5520ac0e393df601d824138fe2129..043a1e3c2917f03b8d7a06191c8596666f2e2bef 100644
--- a/source/armarx/navigation/client/ComponentPlugin.h
+++ b/source/armarx/navigation/client/ComponentPlugin.h
@@ -63,13 +63,12 @@ namespace armarx::navigation::client
         void configureNavigator(const client::NavigationStackConfig& stackConfig);
 
         Navigator& getNavigator();
-        
+
         // Non-API
         ~ComponentPluginUser() override;
 
     private:
         ComponentPlugin* plugin = nullptr;
-
     };
 
 } // namespace armarx::navigation::client