diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp
index 6d4209f..7540d1b 100644
--- a/src/tbf_dl.cpp
+++ b/src/tbf_dl.cpp
@@ -609,8 +609,12 @@
 		num_bsns += 1;
 	}
 
-	if (num_bsns == 1)
-		cs.decToSingleBlock(&need_padding);
+	if (num_bsns == 1) {
+		/* TODO: remove the conditional when MCS-6 padding isn't
+		 * failing to be decoded by MEs anymore */
+		if (cs != GprsCodingScheme(GprsCodingScheme::MCS8))
+			cs.decToSingleBlock(&need_padding);
+	}
 
 	gprs_rlc_data_info_init_dl(&rlc, cs, need_padding);