diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinReplOutputHighlighter.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinReplOutputHighlighter.kt
index 03084bf056a..14bab5c5619 100644
--- a/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinReplOutputHighlighter.kt
+++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinReplOutputHighlighter.kt
@@ -123,7 +123,7 @@ public class KotlinReplOutputHighlighter(
         }.values().map { messages ->
             val highlighters = messages.map { message ->
                 val cmdStart = lastCommandStartOffset + message.range.startOffset
-                val cmdEnd = lastCommandStartOffset + message.range.endOffset
+                val cmdEnd = lastCommandStartOffset + Math.max(message.range.endOffset, message.range.startOffset + 1)
 
                 val textAttributes = getAttributesForSeverity(cmdStart, cmdEnd, message.severity)
                 historyMarkup.addRangeHighlighter(