diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index c5efdddc..857b654c 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -712,6 +712,8 @@ _handle_esc_csi_color_set(Termpty *ty, Eina_Unicode **ptr,
            case -CSI_ARG_ERROR:
               return;
              /* TODO: -CSI_ARG_NO_VALUE */
+           case -CSI_ARG_NO_VALUE:
+              EINA_FALLTHROUGH;
            case 0: // reset to normal
               termpty_reset_att(&(ty->termstate.att));
               break;
diff --git a/tests/sgr-leading-trailing-semicolon.sh b/tests/sgr-leading-trailing-semicolon.sh
new file mode 100755
index 00000000..d45678a0
--- /dev/null
+++ b/tests/sgr-leading-trailing-semicolon.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# fill space with E
+printf '\033#8'
+# cursor to 0,0
+printf '\033[H'
+
+printf '\e[31;mabcd\n'
+printf '\e[;31mabcd\n'
+printf '\e[46;;31mabcd\n'
diff --git a/tests/tests.results b/tests/tests.results
index ea5bddcc..4a2be95d 100644
--- a/tests/tests.results
+++ b/tests/tests.results
@@ -26,3 +26,4 @@ dsr-os.sh 1645f13652d7ee51d66dc93000247280
 dsr-pp.sh 0f0a7d5beccefbad4f4984fc4611276e
 dsr-udk.sh f3a20968a2f25bfd36875dbc5f64ab16
 colors.sh 532494a2e56c102ee10ab1a9b8f176d7
+sgr-leading-trailing-semicolon.sh d7701f1193bde63412a9b969f17e10ec