diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index e73d9f4..fd6b62b 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -775,9 +775,15 @@
 }
 
 static INLINE void set_txfm_ctxs(TX_SIZE tx_size, int n8_w, int n8_h,
-                                 const MACROBLOCKD *xd) {
+                                 const int skip, const MACROBLOCKD *xd) {
   uint8_t bw = tx_size_wide[tx_size];
   uint8_t bh = tx_size_high[tx_size];
+
+  if (skip) {
+    bw = n8_w * 8;
+    bh = n8_h * 8;
+  }
+
   set_txfm_ctx(xd->above_txfm_context, bw, n8_w);
   set_txfm_ctx(xd->left_txfm_context, bh, n8_h);
 }
diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index a318c2f..c70daa7 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -1886,7 +1886,7 @@
             mbmi->inter_tx_size[idy >> 1][idx >> 1] = mbmi->tx_size;
       }
       mbmi->min_tx_size = get_min_tx_size(mbmi->tx_size);
-      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, mbmi->skip, xd);
     }
 #else
   if (inter_block)
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 6f334b4..ba10050 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -1305,11 +1305,11 @@
       }
 #endif  // CONFIG_EXT_TX && CONFIG_RECT_TX
     } else {
-      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+      set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, skip, xd);
       write_selected_tx_size(cm, xd, w);
     }
   } else {
-    set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, xd);
+    set_txfm_ctxs(mbmi->tx_size, xd->n8_w, xd->n8_h, skip, xd);
 #else
     write_selected_tx_size(cm, xd, w);
 #endif
diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index dd31271..95d5cb9 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -5492,7 +5492,7 @@
     else
       tx_size = (bsize >= BLOCK_8X8) ? tx_size : TX_4X4;
     mbmi->tx_size = tx_size;
-    set_txfm_ctxs(tx_size, xd->n8_w, xd->n8_h, xd);
+    set_txfm_ctxs(tx_size, xd->n8_w, xd->n8_h, (mbmi->skip || seg_skip), xd);
   }
 #endif
 }