diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt
index b80099087961..f5bbe7aeb749 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/TerminalOutputController.kt
@@ -173,7 +173,7 @@ class TerminalOutputController(
     // Can not use invokeAndWait here because deadlock may happen. TerminalTextBuffer is locked at this place,
     // and EDT can be frozen now trying to acquire this lock
     invokeLater(ModalityState.any()) {
-      if (!editor.isDisposed) {
+      if (!editor.isDisposed && runningCommandContext != null) {
         doWithScrollingAware {
           doUpdateEditorContent(output)
         }