diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 29d226f..eb76fa2 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -453,15 +453,6 @@
 
 	llc_queue_move_and_merge(&ms->llc_queue, &old_ms->llc_queue);
 
-	if (!ms_dl_tbf(ms) && ms_dl_tbf(old_ms)) {
-		struct gprs_rlcmac_dl_tbf *dl_tbf = ms_dl_tbf(old_ms);
-		LOGPTBFDL(dl_tbf, LOGL_NOTICE,
-			  "Merge MS: Move DL TBF: %s => %s\n",
-			  old_ms_name, ms_name(ms));
-		/* Move the DL TBF to the new MS */
-		tbf_set_ms(dl_tbf_as_tbf(dl_tbf), ms);
-	}
-
 	/* Clean up the old MS object */
 	/* TODO: Use timer? */
 	if (ms_ul_tbf(old_ms) && !tbf_timers_pending((struct gprs_rlcmac_tbf *)ms_ul_tbf(old_ms), T_MAX))
diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c
index 7d1f9b1..6b455da 100644
--- a/src/tbf_dl_fsm.c
+++ b/src/tbf_dl_fsm.c
@@ -163,7 +163,19 @@
 		 * listening on PDCH) in order to move to FLOW state and start
 		 * transmitting data to it. When X2002 triggers (see cb timer
 		 * end of the file) it will send  TBF_EV_ASSIGN_READY_CCCH back
-		 * to us here. */
+		 * to us here.
+		 */
+		if (!(ctx->state_flags & (1 << GPRS_RLCMAC_FLAG_CCCH))) {
+			/* This can happen if we initiated a CCCH DlAss from an
+			 * older TBF object (same TLLI) towards BTS, and the DL-TBF
+			 * was recreated and is now trying to be assigned throguh
+			 * PACCH.
+			 */
+			LOGPTBFDL(ctx->dl_tbf, LOGL_INFO,
+				  "Ignoring event ASSIGN_PCUIF_CNF from BTS "
+				  "(CCCH was not requested on current assignment)\n");
+			break;
+		}
 		fi->T = -2002;
 		val = osmo_tdef_get(the_pcu->T_defs, fi->T, OSMO_TDEF_MS, -1);
 		sec = val / 1000;