diff --git a/src/mldebug/batch_runner.py b/src/mldebug/batch_runner.py
index c14098b..cb20276 100644
--- a/src/mldebug/batch_runner.py
+++ b/src/mldebug/batch_runner.py
@@ -351,7 +351,9 @@ def _process_start_breakpoint(self, layer, it, sid=0):
     # L3 buffer dump: X2 dumps at first iteration, VAIML at last iteration
     if self.args.x2_folder_path is not None and first_it and sid == 0:
       self.dumper.dump_x2_buffers(layer, it)
-    elif self.args.vaiml_folder_path is not None and it == layer.lcp.num_iter and sid == 0:
+    elif self.args.vaiml_folder_path is not None and sid == 0 and (
+     it == layer.lcp.num_iter or self.args.run_flags.skip_iter2
+    ):
       self.dumper.dump_l3_buffers(layer)
 
     if self.args.run_flags.skip_dump: