diff --git a/src/algorithms/channel/libs/channel_fsm.cc b/src/algorithms/channel/libs/channel_fsm.cc
index c092c77a8..6e9170970 100644
--- a/src/algorithms/channel/libs/channel_fsm.cc
+++ b/src/algorithms/channel/libs/channel_fsm.cc
@@ -29,7 +29,7 @@
 ChannelFsm::ChannelFsm()
     : queue_(nullptr),
       channel_(0U),
-      state_(0U)
+      state_(FSM_STATE_IDLE)
 {
     acq_ = nullptr;
     trk_ = nullptr;
@@ -40,7 +40,7 @@ ChannelFsm::ChannelFsm(std::shared_ptr<AcquisitionInterface> acquisition)
     : acq_(std::move(acquisition)),
       queue_(nullptr),
       channel_(0U),
-      state_(0U)
+      state_(FSM_STATE_IDLE)
 {
     trk_ = nullptr;
 }
@@ -48,23 +48,26 @@ ChannelFsm::ChannelFsm(std::shared_ptr<AcquisitionInterface> acquisition)
 
 bool ChannelFsm::Event_stop_channel()
 {
-    std::lock_guard<std::mutex> lk(mx_);
+    std::unique_lock<std::mutex> lk(mx_);
+    auto current_state = state_;
+    state_ = FSM_STATE_TERMINATING;
     DLOG(INFO) << "CH = " << channel_ << ". Ev stop channel";
-    switch (state_)
+    lk.unlock();
+    switch (current_state)
         {
-        case 0:  // already in stanby
-            break;
-        case 1:  // acquisition
-            state_ = 0;
+        case FSM_STATE_IDLE:
+            return true;
+        case FSM_STATE_ACQUISITION:
             stop_acquisition();
             break;
-        case 2:  // tracking
-            state_ = 0;
+        case FSM_STATE_TRACKING:
             stop_tracking();
             break;
         default:
             break;
         }
+    lk.lock();
+    state_ = FSM_STATE_IDLE;
     return true;
 }
 
@@ -72,11 +75,11 @@ bool ChannelFsm::Event_stop_channel()
 bool ChannelFsm::Event_start_acquisition_fpga()
 {
     std::lock_guard<std::mutex> lk(mx_);
-    if ((state_ == 1) || (state_ == 2))
+    if ((state_ == FSM_STATE_ACQUISITION) || (state_ == FSM_STATE_TRACKING) || (state_ == FSM_STATE_TERMINATING))
         {
             return false;
         }
-    state_ = 1;
+    state_ = FSM_STATE_ACQUISITION;
     DLOG(INFO) << "CH = " << channel_ << ". Ev start acquisition FPGA";
     return true;
 }
@@ -85,11 +88,11 @@ bool ChannelFsm::Event_start_acquisition_fpga()
 bool ChannelFsm::Event_start_acquisition()
 {
     std::lock_guard<std::mutex> lk(mx_);
-    if ((state_ == 1) || (state_ == 2))
+    if ((state_ == FSM_STATE_ACQUISITION) || (state_ == FSM_STATE_TRACKING) || (state_ == FSM_STATE_TERMINATING))
         {
             return false;
         }
-    state_ = 1;
+    state_ = FSM_STATE_ACQUISITION;
     start_acquisition();
     DLOG(INFO) << "CH = " << channel_ << ". Ev start acquisition";
     return true;
@@ -99,11 +102,11 @@ bool ChannelFsm::Event_start_acquisition()
 bool ChannelFsm::Event_valid_acquisition()
 {
     std::lock_guard<std::mutex> lk(mx_);
-    if (state_ != 1)
+    if (state_ != FSM_STATE_ACQUISITION)
         {
             return false;
         }
-    state_ = 2;
+    state_ = FSM_STATE_TRACKING;
     start_tracking();
     DLOG(INFO) << "CH = " << channel_ << ". Ev valid acquisition";
     return true;
@@ -113,11 +116,11 @@ bool ChannelFsm::Event_valid_acquisition()
 bool ChannelFsm::Event_failed_acquisition_repeat()
 {
     std::lock_guard<std::mutex> lk(mx_);
-    if (state_ != 1)
+    if (state_ != FSM_STATE_ACQUISITION)
         {
             return false;
         }
-    state_ = 1;
+    state_ = FSM_STATE_ACQUISITION;
     start_acquisition();
     DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition repeat";
     return true;
@@ -127,11 +130,11 @@ bool ChannelFsm::Event_failed_acquisition_repeat()
 bool ChannelFsm::Event_failed_acquisition_no_repeat()
 {
     std::lock_guard<std::mutex> lk(mx_);
-    if (state_ != 1)
+    if (state_ != FSM_STATE_ACQUISITION)
         {
             return false;
         }
-    state_ = 3;
+    state_ = FSM_STATE_FAILED_NO_REPEAT;
     request_satellite();
     DLOG(INFO) << "CH = " << channel_ << ". Ev failed acquisition no repeat";
     return true;
@@ -141,11 +144,11 @@ bool ChannelFsm::Event_failed_acquisition_no_repeat()
 bool ChannelFsm::Event_failed_tracking_standby()
 {
     std::lock_guard<std::mutex> lk(mx_);
-    if (state_ != 2)
+    if (state_ != FSM_STATE_TRACKING)
         {
             return false;
         }
-    state_ = 0U;
+    state_ = FSM_STATE_IDLE;
     notify_stop_tracking();
     DLOG(INFO) << "CH = " << channel_ << ". Ev failed tracking standby";
     return true;
diff --git a/src/algorithms/channel/libs/channel_fsm.h b/src/algorithms/channel/libs/channel_fsm.h
index 60e248449..398bd2233 100644
--- a/src/algorithms/channel/libs/channel_fsm.h
+++ b/src/algorithms/channel/libs/channel_fsm.h
@@ -62,6 +62,14 @@ public:
     virtual bool Event_failed_acquisition_no_repeat();
 
 private:
+    enum fsm_state
+    {
+        FSM_STATE_IDLE = 0,
+        FSM_STATE_ACQUISITION,
+        FSM_STATE_TRACKING,
+        FSM_STATE_FAILED_NO_REPEAT,
+        FSM_STATE_TERMINATING
+    };
     void start_tracking();
     void stop_acquisition();
     void stop_tracking();
@@ -77,7 +85,7 @@ private:
     Concurrent_Queue<pmt::pmt_t>* queue_;
 
     uint32_t channel_;
-    uint32_t state_;
+    fsm_state state_;
 };