diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
index c94a9a4ab0b..500626d1440 100644
--- a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
+++ b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
@@ -71,9 +71,9 @@ class TextDocumentServiceHandler(
                     realTimeEdit(event)
                 }
             }
-            file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             ApplicationManager.getApplication().runReadAction {
-                FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener, this)
+                FileDocumentManager.getInstance().getDocument(file)?.addDocumentListener(listener)
+                file.putUserData(KEY_REAL_TIME_EDIT_LISTENER, listener)
             }
         }
         AmazonQLspService.executeIfRunning(project) { languageServer ->