diff --git a/src/Fixer/Semicolon/SpaceAfterSemicolonFixer.php b/src/Fixer/Semicolon/SpaceAfterSemicolonFixer.php
index de9467fca0c..45dd2f40475 100644
--- a/src/Fixer/Semicolon/SpaceAfterSemicolonFixer.php
+++ b/src/Fixer/Semicolon/SpaceAfterSemicolonFixer.php
@@ -113,6 +113,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
                     )
                 ) {
                     $tokens->insertAt($index + 1, new Token([T_WHITESPACE, ' ']));
+                    ++$max;
                 }
 
                 continue;
diff --git a/tests/Fixer/Semicolon/SpaceAfterSemicolonFixerTest.php b/tests/Fixer/Semicolon/SpaceAfterSemicolonFixerTest.php
index 239995f7296..6e7eb0b4ece 100644
--- a/tests/Fixer/Semicolon/SpaceAfterSemicolonFixerTest.php
+++ b/tests/Fixer/Semicolon/SpaceAfterSemicolonFixerTest.php
@@ -258,6 +258,30 @@ public function provideFixCases()
                     }
                 ',
             ],
+            [
+                '<?php if ($a):?>
+                    1
+                <?php endif; ?>
+                <?php if ($b):?>
+                    2
+                <?php endif; ?>
+                <?php if ($c):?>
+                    3
+                <?php endif; ?>',
+                '<?php if ($a):?>
+                    1
+                <?php endif;?>
+                <?php if ($b):?>
+                    2
+                <?php endif;?>
+                <?php if ($c):?>
+                    3
+                <?php endif;?>',
+            ],
+            [
+                '<?php echo 1; ; ; ; ; ; ; ; ;',
+                '<?php echo 1;;;;;;;;;',
+            ],
         ];
     }