diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 145c41a..b9cbe9c 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -178,7 +178,7 @@
                               max_scan_line, eob, cm->reduced_tx_set_used);
     }
   }
-  if (plane == AOM_PLANE_Y && xd->cfl.store_y) {
+  if (plane == AOM_PLANE_Y && store_cfl_required(cm, xd)) {
     cfl_store_tx(xd, row, col, tx_size, mbmi->sb_type);
   }
 }
@@ -504,8 +504,7 @@
         }
       }
     }
-
-    if (xd->cfl.store_y) {
+    if (store_cfl_required(cm, xd)) {
       cfl_store_block(xd, mbmi->sb_type, mbmi->tx_size);
     }
   }