diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 4106860..7830ba9 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2151,6 +2151,15 @@
     assert(*tok < tok_end);
     for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
       MB_MODE_INFO *mbmi = &m->mbmi;
+
+#if CONFIG_CB4X4
+      if (mbmi->sb_type < BLOCK_8X8 && plane &&
+          !is_chroma_reference(mi_row, mi_col)) {
+        (*tok)++;
+        continue;
+      }
+#endif
+
 #if CONFIG_VAR_TX
       const struct macroblockd_plane *const pd = &xd->plane[plane];
       BLOCK_SIZE bsize = mbmi->sb_type;
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index d05dff5..bf0dff9 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -816,6 +816,16 @@
 
     td->counts->skip[ctx][0] += skip_inc;
     for (plane = 0; plane < MAX_MB_PLANE; ++plane) {
+#if CONFIG_CB4X4
+      if (bsize < BLOCK_8X8 && plane && !is_chroma_reference(mi_row, mi_col)) {
+        (*t)->token = EOSB_TOKEN;
+        (*t)++;
+        continue;
+      }
+#else
+      (void)mi_row;
+      (void)mi_col;
+#endif
       av1_foreach_transformed_block_in_plane(xd, bsize, plane, tokenize_b,
                                              &arg);
       (*t)->token = EOSB_TOKEN;