diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt b/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt
index 03aee483f..510e93c34 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/event/HangulCombiner.kt
@@ -43,7 +43,9 @@ class HangulCombiner : Combiner {
             val currentSyllable = syllable ?: HangulSyllable()
             val jamo = HangulJamo.of(event.mCodePoint)
             if(!event.isCombining || jamo is HangulJamo.NonHangul) {
+                composingWord.append(currentSyllable.string)
                 composingWord.append(jamo.string)
+                history.clear()
             } else {
                 when(jamo) {
                     is HangulJamo.Consonant -> {