diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.cpp b/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.cpp
index 524c9878..aadd088e 100644
--- a/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.cpp
+++ b/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.cpp
@@ -17,6 +17,16 @@
 
 static const int FAIL_PENDING_TIMEOUT = 2000; //2000ms
 
+SmFailoverFailPendingState::SmFailoverFailPendingState(SmFailoverFSM& fsm) : SmFSMState(fsm)
+{
+    this->_pending_timer_id = SM_TIMER_ID_INVALID;
+}
+
+SmFailoverFailPendingState::~SmFailoverFailPendingState()
+{
+    this->_deregister_timer();
+}
+
 SmErrorT SmFailoverFailPendingState::event_handler(SmFailoverEventT event, const ISmFSMEventData* event_data)
 {
     //SmFSMEventDataTypeT event_data_type = event_data->get_event_data_type();
diff --git a/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.h b/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.h
index 69befd13..7b2c7fe4 100644
--- a/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.h
+++ b/service-mgmt/sm-1.0.0/src/sm_failover_fail_pending_state.h
@@ -12,7 +12,8 @@
 class SmFailoverFailPendingState : public SmFSMState
 {
     public:
-        SmFailoverFailPendingState(SmFailoverFSM& fsm) : SmFSMState(fsm){}
+        SmFailoverFailPendingState(SmFailoverFSM& fsm);
+        virtual ~SmFailoverFailPendingState();
         SmErrorT enter_state();
         SmErrorT exit_state();