diff --git a/lib/src/upper/rlc_am_lte.cc b/lib/src/upper/rlc_am_lte.cc
index c67064553..865ca7d70 100644
--- a/lib/src/upper/rlc_am_lte.cc
+++ b/lib/src/upper/rlc_am_lte.cc
@@ -242,6 +242,10 @@ void rlc_am_lte::rlc_am_lte_tx::stop()
 
   // Drop all messages in RETX queue
   retx_queue.clear();
+
+  // Drop all SDU info in queue
+  undelivered_sdu_info_queue.clear();
+
   pthread_mutex_unlock(&mutex);
 }
 
diff --git a/srsenb/src/stack/rrc/rrc_mobility.cc b/srsenb/src/stack/rrc/rrc_mobility.cc
index 4566c5a92..4dc17664b 100644
--- a/srsenb/src/stack/rrc/rrc_mobility.cc
+++ b/srsenb/src/stack/rrc/rrc_mobility.cc
@@ -970,8 +970,8 @@ void rrc::ue::rrc_mobility::handle_crnti_ce(intraenb_ho_st& s, const user_crnti_
 
   if (is_first_crnti_ce) {
     // Need to reset SNs of bearers.
-    rrc_enb->pdcp->reestablish(rrc_ue->rnti);
     rrc_enb->rlc->reestablish(rrc_ue->rnti);
+    rrc_enb->pdcp->reestablish(rrc_ue->rnti);
 
     // Change PCell in MAC/Scheduler
     rrc_ue->mac_ctrl.handle_crnti_ce(ev.temp_crnti);