diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt
index 83762950c..0345e9684 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatElement.kt
@@ -174,7 +174,7 @@ class ChatElement(guiRenderer: GUIRenderer) : AbstractChatElement(guiRenderer),
         val value = input.value
         input.submit()
         input.value = ""
-        if (history.lastOrNull() != value) {
+        if (history.lastOrNull() != value && value.isNotBlank()) {
             // ToDo: Improve history
             history += value
         }
@@ -202,6 +202,7 @@ class ChatElement(guiRenderer: GUIRenderer) : AbstractChatElement(guiRenderer),
                     historyIndex--
                     input.value = history[historyIndex]
                 }
+
                 KeyCodes.KEY_DOWN -> {
                     val size = history.size
                     historyIndex++