diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index a4af62a..e3ca946 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -4914,10 +4914,12 @@
 #error "CONFIG_PVQ currently requires CONFIG_DAALA_EC."
 #endif
   od_adapt_ctx_reset(adapt, 0);
-#elif CONFIG_EC_ADAPT
+#endif  // #if CONFIG_PVQ
+
+#if CONFIG_EC_ADAPT
   this_tile->tctx = *cm->fc;
   td->mb.e_mbd.tile_ctx = &this_tile->tctx;
-#endif  // #if CONFIG_PVQ
+#endif  // #if CONFIG_EC_ADAPT
 
   for (mi_row = tile_info->mi_row_start; mi_row < tile_info->mi_row_end;
        mi_row += cm->mib_size) {