diff --git a/autoload/repeat.vim b/autoload/repeat.vim
index ef72247..6acb48e 100644
--- a/autoload/repeat.vim
+++ b/autoload/repeat.vim
@@ -55,6 +55,7 @@ let g:repeat_reg = ['', '']
 " Special function to avoid spurious repeats in a related, naturally repeating
 " mapping when your repeatable mapping doesn't increase b:changedtick.
 function! repeat#invalidate()
+    autocmd! repeat_custom_motion
     let g:repeat_tick = -1
 endfunction