diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
index 3279ed5788df..82dd1d5d1372 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretImpl.java
@@ -1440,7 +1440,7 @@ public class CaretImpl extends UserDataHolderBase implements Caret, Dumpable {
   }
 
   void updateCachedStateIfNeeded() {
-    assertIsDispatchThread();
+    if (!ApplicationManager.getApplication().isDispatchThread()) return;
     int modelCounter = myEditor.getCaretModel().myDocumentUpdateCounter;
     if (myDocumentUpdateCounter != modelCounter) {
       LogicalPosition lp = myEditor.offsetToLogicalPosition(getOffset());