diff --git a/packages/core/schematics/ng-generate/control-flow-migration/util.ts b/packages/core/schematics/ng-generate/control-flow-migration/util.ts
index 2d38619a6eb4a..ff13d77dc49f9 100644
--- a/packages/core/schematics/ng-generate/control-flow-migration/util.ts
+++ b/packages/core/schematics/ng-generate/control-flow-migration/util.ts
@@ -101,7 +101,7 @@ export function migrateTemplate(template: string): {migrated: string|null, error
       // Allows for ICUs to be parsed.
       tokenizeExpansionForms: true,
       // Explicitly disable blocks so that their characters are treated as plain text.
-      tokenizeBlocks: false,
+      tokenizeBlocks: true,
       preserveLineEndings: true,
     });
 
diff --git a/packages/core/schematics/test/control_flow_migration_spec.ts b/packages/core/schematics/test/control_flow_migration_spec.ts
index 822a659626975..79da0a927e2e0 100644
--- a/packages/core/schematics/test/control_flow_migration_spec.ts
+++ b/packages/core/schematics/test/control_flow_migration_spec.ts
@@ -2085,5 +2085,45 @@ describe('control flow migration', () => {
 
       expect(content).toContain('template: `<div><span>shrug</span></div>`');
     });
+
+    it('should do nothing with already present updated control flow', async () => {
+      writeFile('/comp.ts', `
+        import {Component} from '@angular/core';
+        import {NgIf} from '@angular/common';
+
+        @Component({
+          imports: [NgIf],
+          template: \`<div>@if (toggle) {<span>shrug</span>}</div>\`
+        })
+        class Comp {
+          toggle = false;
+        }
+      `);
+
+      await runMigration();
+      const content = tree.readContent('/comp.ts');
+      expect(content).toContain('template: `<div>@if (toggle) {<span>shrug</span>}</div>`');
+    });
+
+    it('should migrate an ngif inside a block', async () => {
+      writeFile('/comp.ts', `
+        import {Component} from '@angular/core';
+        import {NgIf} from '@angular/common';
+
+        @Component({
+          imports: [NgIf],
+          template: \`<div>@if (toggle) {<div><span *ngIf="show">shrug</span></div>}</div>\`
+        })
+        class Comp {
+          toggle = false;
+          show = false;
+        }
+      `);
+
+      await runMigration();
+      const content = tree.readContent('/comp.ts');
+      expect(content).toContain(
+          'template: `<div>@if (toggle) {<div>@if (show) {<span>shrug</span>}</div>}</div>`');
+    });
   });
 });