diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index cbbdb60..699cf38 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -813,6 +813,10 @@
       update_arf_stack(ref_map_index, ref_buffer_stack);
       stack_push(ref_buffer_stack->gld_stack, &ref_buffer_stack->gld_stack_size,
                  ref_map_index);
+      // For fast nonrd_mode: update LAST as well on GF_UPDATE frame.
+      if (cpi->sf.use_fast_nonrd_pick_mode)
+        stack_push(ref_buffer_stack->lst_stack,
+                   &ref_buffer_stack->lst_stack_size, ref_map_index);
       break;
     case LF_UPDATE:
       update_arf_stack(ref_map_index, ref_buffer_stack);