diff --git a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp
index 64fb7b95ad724007e5a88f1c3690b8550616c57c..6b124cdb76197760261a1b851f7a3b188a978490 100644
--- a/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleUnits.cpp
@@ -105,7 +105,7 @@ namespace armarx::RobotUnitModule
                                  const ::Ice::Current&) final override
         {
             armarx::core::time::Duration safeDuration =
-                armarx::core::time::Duration::MilliSeconds(2'000);
+                armarx::core::time::Duration::MilliSeconds(500);
 
             // If the SS2 should be released (target state = inactive) we check whether the last
             // activation happened at least before safeDuration.