diff --git a/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp b/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp
index e72437e9519c77d56257a5bc354eb0cf7f52da1c..da1915068ba7f8e12cb0bf2c17071ffac12e5f05 100644
--- a/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp
+++ b/source/Navigation/libraries/server/execution/PlatformUnitExecutor.cpp
@@ -17,7 +17,21 @@ namespace armarx::nav::server
 
     void PlatformUnitExecutor::move(const core::Twist& twist)
     {
-        platformUnit->move(twist.linear.x(), twist.linear.y(), twist.angular.z());
+        if (enabled.get())
+        {
+            platformUnit->move(twist.linear.x(), twist.linear.y(), twist.angular.z());
+        }
+    }
+
+    void PlatformUnitExecutor::disableAndStop()
+    {
+        enabled.set(false);
+        platformUnit->move(0, 0, 0);
+    }
+
+    void PlatformUnitExecutor::enable()
+    {
+        enabled.set(true);
     }
 
 }