diff --git a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
index 150dff080fe5..0880e395308f 100644
--- a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+++ b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
@@ -126,7 +126,11 @@ public class ConsoleViewUtil {
 
       @Override
       public Font getFont(EditorFontType key) {
-        return super.getFont(EditorFontType.getConsoleType(key));
+        Font font = super.getFont(EditorFontType.getConsoleType(key));
+        if (font == null) {
+          return super.getFont(key);
+        }
+        return font;
       }
 
       @Override