diff --git a/core/nextEdit/DocumentHistoryTracker.ts b/core/nextEdit/DocumentHistoryTracker.ts
index 34ea763bf..7cca91f56 100644
--- a/core/nextEdit/DocumentHistoryTracker.ts
+++ b/core/nextEdit/DocumentHistoryTracker.ts
@@ -63,11 +63,12 @@ export class DocumentHistoryTracker {
     if (!astHistory || !documentHistory) {
       console.error(`Document ${documentPath} not found in AST tracker`);
       this.addDocument(documentPath, documentContent, ast);
+      return; // Early return - document was added with initial state
     }
 
-    // Push to top (LIFO).
-    astHistory!.unshift(ast);
-    documentHistory!.unshift(documentContent);
+    // Only execute this if the arrays already existed
+    astHistory.unshift(ast);
+    documentHistory.unshift(documentContent);
   }
 
   /**