diff --git a/compiler/wasm32/aasmcpu.pas b/compiler/wasm32/aasmcpu.pas
index 1f93e76e76..18eaf42499 100644
--- a/compiler/wasm32/aasmcpu.pas
+++ b/compiler/wasm32/aasmcpu.pas
@@ -2655,6 +2655,7 @@ uses
             if p.typ=ait_wasm_structured_instruction then
               begin
                 taicpu_wasm_structured_instruction(p).Map(f,blockstack);
+                p:=tai(p.next);
               end
             else
               begin