diff --git a/src/tiago_arm_module.cpp b/src/tiago_arm_module.cpp
index 3c89ed29b63b1aed2f742fd78bcbe6c5866d680c..29c3cfd27b8df37a414e9eb567cfb5c1b863cafb 100644
--- a/src/tiago_arm_module.cpp
+++ b/src/tiago_arm_module.cpp
@@ -70,34 +70,28 @@ void CTiagoArmModule::state_machine(void)
                             case ACTION_SUCCESS: ROS_INFO("CTiagoArmModule : action ended successfully");
                                                  this->state=TIAGO_ARM_MODULE_IDLE;
                                                  this->status=TIAGO_ARM_MODULE_SUCCESS;
-                                                 this->arm_action.stop_timeout();
                                                  break;
                             case ACTION_TIMEOUT: ROS_ERROR("CTiagoArmModule : action did not finish in the allowed time");
                                                  this->arm_action.cancel();
                                                  this->state=TIAGO_ARM_MODULE_IDLE;
                                                  this->status=TIAGO_ARM_MODULE_TIMEOUT;
-                                                 this->arm_action.stop_timeout();
                                                  break;
                             case ACTION_FB_WATCHDOG: ROS_ERROR("CTiagoArmModule : No feeback received for a long time");
                                                      this->arm_action.cancel();
                                                      this->state=TIAGO_ARM_MODULE_IDLE;
                                                      this->status=TIAGO_ARM_MODULE_FB_WATCHDOG;
-                                                     this->arm_action.stop_timeout();
                                                      break;
                             case ACTION_ABORTED: ROS_ERROR("CTiagoArmModule : Action failed to complete");
                                                  this->state=TIAGO_ARM_MODULE_IDLE;
                                                  this->status=TIAGO_ARM_MODULE_ABORTED;
-                                                 this->arm_action.stop_timeout();
                                                  break;
                             case ACTION_PREEMPTED: ROS_ERROR("CTiagoArmModule : Action was interrupted by another request");
                                                    this->state=TIAGO_ARM_MODULE_IDLE;
                                                    this->status=TIAGO_ARM_MODULE_PREEMPTED;
-                                                   this->arm_action.stop_timeout();
                                                    break;
                             case ACTION_REJECTED: ROS_ERROR("CTiagoArmModule : Action was rejected by server");
                                                   this->state=TIAGO_ARM_MODULE_IDLE;
                                                   this->status=TIAGO_ARM_MODULE_REJECTED;
-                                                  this->arm_action.stop_timeout();
                                                   break;
                          }
                          if(this->cancel_pending)