diff --git a/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java b/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
index a054c81fd4bd..a998502659bc 100644
--- a/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
+++ b/platform/platform-impl/src/com/intellij/execution/process/ConsoleHistoryModel.java
@@ -28,7 +28,8 @@ public class ConsoleHistoryModel implements ModificationTracker {
       myHistoryCursor = -1;
 
       myHistory.remove(statement);
-      if (myHistory.size() >= maxHistorySize) {
+      int size = myHistory.size();
+      if (size >= maxHistorySize && size > 0) {
         myHistory.removeLast();
       }
       myHistory.addFirst(statement);