diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
index 3c59b2980191bdf4d560b5e0f303207d2f13e48e..7a4305c6fe26ea6bf54aab17e9e87843688aa0a1 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/RobotReader.cpp
@@ -112,7 +112,6 @@ namespace armarx::armem::robot_state
     {
         const auto tsStartFunctionInvokation = armem::Time::Now();
 
-        Clock clock;
         while (true)
         {
             auto state = queryState(obj.description, timestamp);
@@ -130,7 +129,7 @@ namespace armarx::armem::robot_state
                 }
 
                 ARMARX_INFO << "Retrying to query robot state after failure";
-                clock.waitFor(sleepAfterFailure);
+                Clock::WaitFor(sleepAfterFailure);
             }
 
             obj.config = std::move(*state);
diff --git a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
index b59eaad146c043c1b943a5589caa84c768549303..6eeb7e2e9503dd6cf0f876bc4676dc50effc3b50 100644
--- a/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
+++ b/source/RobotAPI/libraries/armem_robot_state/client/common/VirtualRobotReader.cpp
@@ -92,8 +92,6 @@ namespace armarx::armem::robot_state
         const VirtualRobot::RobotIO::RobotDescription& loadMode,
         const bool blocking)
     {
-        Clock clock;
-
         while (blocking)
         {
             VirtualRobot::RobotPtr robot = getRobot(name, timestamp, loadMode);
@@ -103,7 +101,7 @@ namespace armarx::armem::robot_state
             }
 
             ARMARX_INFO << "Retrying to query robot after failure";
-            clock.waitFor(sleepAfterFailure);
+            Clock::WaitFor(sleepAfterFailure);
         }
 
         ARMARX_WARNING << "Failed to get synchronized robot `" << name << "`";