diff --git a/src/PandaUtil.cpp b/src/PandaUtil.cpp
index b69ca2fc99f56fdcc97c438656e4923ce3a1df24..bf4a11a472f0db1154451c33f1a9c325233fb51f 100644
--- a/src/PandaUtil.cpp
+++ b/src/PandaUtil.cpp
@@ -15,7 +15,7 @@ bool PandaUtil::recoverFromErrors() {
   }
   franka_msgs::ErrorRecoveryGoal goal;
   ac.sendGoal(goal);
-  if (ac.waitForResult(ros::Duration(20.0))) {
+  if (ac.waitForResult(ros::Duration(5.0))) {
     actionlib::SimpleClientGoalState state = ac.getState();
     ROS_INFO_STREAM("Panda error recovery finished: " <<  state.toString());
     return state == actionlib::SimpleClientGoalState::SUCCEEDED;