diff --git a/packages/compiler-vapor/src/generate.ts b/packages/compiler-vapor/src/generate.ts
index a37514da5..89af789f5 100644
--- a/packages/compiler-vapor/src/generate.ts
+++ b/packages/compiler-vapor/src/generate.ts
@@ -107,7 +107,6 @@ export class CodegenContext {
     }
 
     for (const [prefix, nums] of map) {
-      if (nums.size === 0) continue
       this.nextIdMap.set(prefix, buildNextIdMap(nums))
     }
   }
diff --git a/packages/compiler-vapor/src/transform.ts b/packages/compiler-vapor/src/transform.ts
index 98d38553e..25061a97b 100644
--- a/packages/compiler-vapor/src/transform.ts
+++ b/packages/compiler-vapor/src/transform.ts
@@ -124,9 +124,7 @@ export class TransformContext<T extends AllNode = AllNode> {
   increaseId = (): number => {
     // allocate an id that won't conflict with user-defined bindings when used
     // as generated identifiers with n/x/r prefixes (e.g., n1, x1, r1).
-    const id = this.nextIdMap
-      ? (this.nextIdMap.get(this.globalId) ?? this.globalId)
-      : this.globalId
+    const id = getNextId(this.nextIdMap, this.globalId)
     // advance next
     this.globalId = getNextId(this.nextIdMap, id + 1)
     return id