diff --git a/src/regexp_bt.c b/src/regexp_bt.c
index 03b07a167..476f34ef4 100644
--- a/src/regexp_bt.c
+++ b/src/regexp_bt.c
@@ -4805,6 +4805,23 @@ theend:
     if (backpos.ga_maxlen > BACKPOS_INITIAL)
 	ga_clear(&backpos);
 
+    // Make sure the end is never before the start.  Can happen when \zs and
+    // \ze are used.
+    if (REG_MULTI)
+    {
+	lpos_T *start = &rex.reg_mmatch->startpos[0];
+	lpos_T *end = &rex.reg_mmatch->endpos[0];
+
+	if (end->lnum < start->lnum
+			|| (end->lnum == start->lnum && end->col < start->col))
+	    rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
+    }
+    else
+    {
+	if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
+	    rex.reg_match->endp[0] = rex.reg_match->startp[0];
+    }
+
     return retval;
 }
 
diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index c75c575fd..da80ee921 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7225,6 +7225,23 @@ nfa_regexec_both(
 #endif
 
 theend:
+    // Make sure the end is never before the start.  Can happen when \zs and
+    // \ze are used.
+    if (REG_MULTI)
+    {
+	lpos_T *start = &rex.reg_mmatch->startpos[0];
+	lpos_T *end = &rex.reg_mmatch->endpos[0];
+
+	if (end->lnum < start->lnum
+			|| (end->lnum == start->lnum && end->col < start->col))
+	    rex.reg_mmatch->endpos[0] = rex.reg_mmatch->startpos[0];
+    }
+    else
+    {
+	if (rex.reg_match->endp[0] < rex.reg_match->startp[0])
+	    rex.reg_match->endp[0] = rex.reg_match->startp[0];
+    }
+
     return retval;
 }
 
diff --git a/src/testdir/test_regexp_latin.vim b/src/testdir/test_regexp_latin.vim
index d1885ab5c..0b0024453 100644
--- a/src/testdir/test_regexp_latin.vim
+++ b/src/testdir/test_regexp_latin.vim
@@ -911,6 +911,13 @@ func Test_start_end_of_buffer_match()
   bwipe!
 endfunc
 
+func Test_ze_before_zs()
+  call assert_equal('', matchstr(' ', '\%#=1\ze \zs'))
+  call assert_equal('', matchstr(' ', '\%#=2\ze \zs'))
+  call assert_equal(repeat([''], 10), matchlist(' ', '\%#=1\ze \zs'))
+  call assert_equal(repeat([''], 10), matchlist(' ', '\%#=2\ze \zs'))
+endfunc
+
 " Check for detecting error
 func Test_regexp_error()
   call assert_fails("call matchlist('x x', '\\%#=1 \\zs*')", 'E888:')
diff --git a/src/version.c b/src/version.c
index 9d09c07a0..9bb587dff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2121,
 /**/
     2120,
 /**/