diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30f4dc75..ac022c4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,10 @@
 ## Unreleased
 ### Added
 ### Changed
+
+* UTF-8 error recovery now discards fewer bytes.
+
+
 ### Deprecated
 ### Removed
 ### Fixed
diff --git a/vt.c b/vt.c
index 9c758c55..173b59a6 100644
--- a/vt.c
+++ b/vt.c
@@ -1041,7 +1041,7 @@ state_utf8_21_switch(struct terminal *term, uint8_t data)
     switch (data) {
         /*              exit                             current                          enter                            new state */
     case 0x80 ... 0xbf:                                  action_utf8_22(term, data);                                       return STATE_GROUND;
-    default:                                                                                                               return STATE_GROUND;
+    default: return state_ground_switch(term, data);
     }
 }
 
@@ -1051,7 +1051,7 @@ state_utf8_31_switch(struct terminal *term, uint8_t data)
     switch (data) {
         /*              exit                             current                          enter                            new state */
     case 0x80 ... 0xbf:                                  action_utf8_32(term, data);                                       return STATE_UTF8_32;
-    default:                                                                                                               return STATE_GROUND;
+    default: return state_ground_switch(term, data);
     }
 }
 
@@ -1061,7 +1061,7 @@ state_utf8_32_switch(struct terminal *term, uint8_t data)
     switch (data) {
         /*              exit                             current                          enter                            new state */
     case 0x80 ... 0xbf:                                  action_utf8_33(term, data);                                       return STATE_GROUND;
-    default:                                                                                                               return STATE_GROUND;
+    default: return state_ground_switch(term, data);
     }
 }
 
@@ -1071,7 +1071,7 @@ state_utf8_41_switch(struct terminal *term, uint8_t data)
     switch (data) {
         /*              exit                             current                          enter                            new state */
     case 0x80 ... 0xbf:                                  action_utf8_42(term, data);                                       return STATE_UTF8_42;
-    default:                                                                                                               return STATE_GROUND;
+    default: return state_ground_switch(term, data);
     }
 }
 
@@ -1081,7 +1081,7 @@ state_utf8_42_switch(struct terminal *term, uint8_t data)
     switch (data) {
         /*              exit                             current                          enter                            new state */
     case 0x80 ... 0xbf:                                  action_utf8_43(term, data);                                       return STATE_UTF8_43;
-    default:                                                                                                               return STATE_GROUND;
+    default: return state_ground_switch(term, data);
     }
 }
 
@@ -1091,7 +1091,7 @@ state_utf8_43_switch(struct terminal *term, uint8_t data)
     switch (data) {
         /*              exit                             current                          enter                            new state */
     case 0x80 ... 0xbf:                                  action_utf8_44(term, data);                                       return STATE_GROUND;
-    default:                                                                                                               return STATE_GROUND;
+    default: return state_ground_switch(term, data);
     }
 }