diff --git a/src/term.c b/src/term.c
index 2158fe3..b287121 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1957,6 +1957,8 @@
 #if defined(UNIX) || defined(VMS)
     term_is_xterm = vim_is_xterm(term);
 #endif
+    is_not_xterm = FALSE;
+    is_mac_terminal = FALSE;
 
 #ifdef FEAT_MOUSE
 # if defined(UNIX) || defined(VMS)
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 0a4170e..ae20280 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -906,7 +906,18 @@
   " Termresponse is only parsed when t_RV is not empty.
   set t_RV=x
 
+  " Do Terminal.app first to check that is_mac_terminal is reset.
+  set ttymouse=xterm
+  call test_option_not_set('ttymouse')
+  let seq = "\<Esc>[>1;95;0c"
+  call feedkeys(seq, 'Lx!')
+  call assert_equal(seq, v:termresponse)
+  call assert_equal('sgr', &ttymouse)
+
   " xterm < 95: "xterm" (actually unmodified)
+  set t_RV=
+  set term=xterm
+  set t_RV=x
   set ttymouse=xterm
   call test_option_not_set('ttymouse')
   let seq = "\<Esc>[>0;94;0c"
diff --git a/src/version.c b/src/version.c
index 4f0e6fa..78d0dc9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2169,
+/**/
     2168,
 /**/
     2167,