diff --git a/srsenb/src/enb.cc b/srsenb/src/enb.cc
index df4c71ae9..82b4e8145 100644
--- a/srsenb/src/enb.cc
+++ b/srsenb/src/enb.cc
@@ -228,15 +228,15 @@ void enb::stop()
 {
   if(started)
   {
+    gtpu.stop();
     phy.stop();
     mac.stop();
-    usleep(1e5);
+    usleep(100000);
 
     rlc.stop();
     pdcp.stop();
-    gtpu.stop();
     rrc.stop();
- 
+
     usleep(1e5);
     if(args->pcap.enable)
     {
diff --git a/srsenb/src/upper/rrc.cc b/srsenb/src/upper/rrc.cc
index f803500f2..89b38dd36 100644
--- a/srsenb/src/upper/rrc.cc
+++ b/srsenb/src/upper/rrc.cc
@@ -223,7 +223,8 @@ void rrc::rem_user(uint16_t rnti)
     rrc_log->console("Disconnecting rnti=0x%x.\n", rnti);
     rrc_log->info("Disconnecting rnti=0x%x.\n", rnti);
     /* **Caution** order of removal here is imporant: from bottom to top */
-    mac->ue_rem(rnti);  // MAC handles PHY 
+    mac->ue_rem(rnti);  // MAC handles PHY
+    usleep(50000);
     rlc->rem_user(rnti);
     pdcp->rem_user(rnti);
     gtpu->rem_user(rnti);