diff --git a/av1/encoder/encoder.h b/av1/encoder/encoder.h
index cfe54c1..067f092 100644
--- a/av1/encoder/encoder.h
+++ b/av1/encoder/encoder.h
@@ -150,8 +150,7 @@
 } UENUM1BYTE(SS_CFG_OFFSET);
 
 // TODO(jingning): This needs to be cleaned up next.
-#define TPL_MAX_LENGTH (70)
-#define MAX_LENGTH_TPL_FRAME_STATS (TPL_MAX_LENGTH + REF_FRAMES + 1)
+#define MAX_LENGTH_TPL_FRAME_STATS (MAX_TOTAL_BUFFERS + REF_FRAMES + 1)
 
 typedef struct TplDepStats {
   int64_t intra_cost;
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 843931d..4d13e1c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2120,7 +2120,7 @@
   assert(IMPLIES(gf_group->size > 0, gf_group->index < gf_group->size));
   const int tpl_idx = gf_group->index;
   const TplDepFrame *tpl_frame = &cpi->tpl_frame[tpl_idx];
-  if (tpl_idx >= TPL_MAX_LENGTH || !tpl_frame->is_valid) {
+  if (tpl_idx >= MAX_LAG_BUFFERS || !tpl_frame->is_valid) {
     return;
   }
 
@@ -2234,7 +2234,7 @@
   TplDepFrame *tpl_frame = &cpi->tpl_frame[tpl_idx];
   const int prune_modes_based_on_tpl =
       cpi->sf.inter_sf.prune_inter_modes_based_on_tpl &&
-      tpl_idx >= TPL_MAX_LENGTH && tpl_frame->is_valid;
+      tpl_idx >= MAX_LAG_BUFFERS && tpl_frame->is_valid;
   int i;
   const int refs[2] = { mbmi->ref_frame[0],
                         (mbmi->ref_frame[1] < 0 ? 0 : mbmi->ref_frame[1]) };