diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4106120d..9e6e4acb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,11 @@ Changelog structure reference:
 
 ## [Unreleased]
 
+### Fixed
+
+- Project
+  - Occasional "AWT events are not allowed inside write action" error coming from LSP
+
 ## [22.0.0]
 
 ### Added
diff --git a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSProjectSettingsService.kt b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSProjectSettingsService.kt
index cccda858..5536bf4a 100644
--- a/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSProjectSettingsService.kt
+++ b/lsp/src/main/kotlin/com/falsepattern/zigbrains/lsp/settings/ZLSProjectSettingsService.kt
@@ -82,7 +82,7 @@ class ZLSProjectSettingsService(val project: Project): PersistentStateComponent<
         }
     }
 
-    fun validateSync() = if (application.isDispatchThread) {
+    fun validateSync() = if (application.isDispatchThread && !application.isWriteAccessAllowed) {
         runWithModalProgressBlocking(ModalTaskOwner.project(project), ZLSBundle.message("progress.title.validate")) {
             validateAsync()
         }