diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index db7da5e..0a07e8d 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1824,6 +1824,26 @@
   delfunc! g:Func
 enddef
 
+def Test_did_emsg_reset()
+  # executing an autocommand resets did_emsg, this should not result in a
+  # builtin function considered failing
+  var lines =<< trim END
+      vim9script
+      au BufWinLeave * #
+      def Func()
+          popup_menu('', {callback: {-> popup_create('', {})->popup_close()}})
+          eval [][0]
+      enddef
+      nno <F3> <cmd>call <sid>Func()<cr>
+      feedkeys("\<F3>\e", 'xt')
+  END
+  writefile(lines, 'XemsgReset')
+  assert_fails('so XemsgReset', ['E684:', 'E684:'], lines, 2)
+  delete('XemsgReset')
+  nunmap <F3>
+  au! BufWinLeave
+enddef
+
 def Test_abort_with_silent_call()
   var lines =<< trim END
       vim9script
diff --git a/src/version.c b/src/version.c
index 6b0ec41..f4211ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2134,
+/**/
     2133,
 /**/
     2132,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 3f61cb4..351ea8b 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -583,7 +583,7 @@
     for (idx = 0; idx < argcount; ++idx)
 	clear_tv(&argvars[idx]);
 
-    if (did_emsg != did_emsg_before)
+    if (did_emsg > did_emsg_before)
 	return FAIL;
     return OK;
 }