diff --git a/src/nvim/register.c b/src/nvim/register.c
index 9c0d7b6237..1df0f0a62a 100644
--- a/src/nvim/register.c
+++ b/src/nvim/register.c
@@ -1401,7 +1401,8 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
                               ? 'c'
                               : (flags & PUT_LINE ? 'i' : (dir == FORWARD ? 'a' : 'i'));
 
-    if (has_event(EVENT_TEXTPUTPRE) || has_event(EVENT_TEXTPUTPOST)) {
+    bool has_textput_events = has_event(EVENT_TEXTPUTPRE) || has_event(EVENT_TEXTPUTPOST);
+    if (has_textput_events) {
       add_last_insert++;
     }
 
@@ -1444,12 +1445,11 @@ void do_put(int regname, yankreg_T *reg, int dir, int count, int flags)
     if (has_event(EVENT_TEXTPUTPRE)) {
       put_do_autocmd('.', NULL, NULL, false, dir);
     }
-
     if (has_event(EVENT_TEXTPUTPOST)) {
       put_do_autocmd('.', NULL, NULL, true, dir);
     }
 
-    if (--add_last_insert == 0) {
+    if (has_textput_events && --add_last_insert == 0) {
       ga_clear(&last_insert_ga);
     }
 
diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim
index f1d262c535..d4fcf98fb6 100644
--- a/test/old/testdir/test_autocmd.vim
+++ b/test/old/testdir/test_autocmd.vim
@@ -5432,22 +5432,27 @@ func Test_TextPutX()
   au! TextPutPre
   let g:pre_event = []
 
-  " Test that recursive ". register calls have the same contents for post and
-  " pre
-  au TextPutPre * put . | let g:pre_event = copy(v:event)
-  au TextPutPost * let g:post_event = copy(v:event)
+  for round in range(2)
+    " Recursive ". register calls have the same contents for post and pre.
+    au TextPutPre * put . | let g:pre_event = copy(v:event)
+    au TextPutPost * let g:post_event = copy(v:event)
 
-  call feedkeys("iinserted\<Esc>", 'x')
-  norm! ".p
+    call feedkeys("iinserted\<Esc>", 'x')
+    norm! ".p
 
-  call assert_equal(
-        \ #{regcontents: ["inserted"], regname: '.',
-        \ operator: 'p', regtype: 'v', visual: v:false},
-        \ g:pre_event)
-  call assert_equal(g:pre_event, g:post_event)
+    call assert_equal(
+          \ #{regcontents: ["inserted"], regname: '.',
+          \ operator: 'p', regtype: 'v', visual: v:false},
+          \ g:pre_event)
+    call assert_equal(g:pre_event, g:post_event)
 
-  au! TextPutPre
-  au! TextPutPost
+    au! TextPutPre
+    au! TextPutPost
+
+    " Pasting ". register without TextPutPre/TextPutPost autocommands should
+    " not interfere with these autocommands in the next round.
+    norm! ".p
+  endfor
 
   unlet g:post_event
   unlet g:pre_event