diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index 32cc45d97452..6ba7340598b7 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -354,8 +354,6 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       myContentSize = 0;
       myBuffer.clear();
       myFolding.clear();
-
-      clearHyperlinkAndFoldings();
     }
     if (myFlushAlarm.isDisposed()) return;
     cancelAllFlushRequests();
@@ -620,13 +618,10 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
       return;
     }
     if (clear) {
-      final DocumentEx document;
+      final DocumentEx document = editor.getDocument();
       synchronized (LOCK) {
         myTokens.clear();
-        editor.getMarkupModel().removeAllHighlighters();
-        document = editor.getDocument();
-        myFoldingAlarm.cancelAllRequests();
-        cancelHeavyAlarm();
+        clearHyperlinkAndFoldings();
       }
       final int documentTextLength = document.getTextLength();
       if (documentTextLength > 0) {