diff --git a/src/nvim/autocmd.h b/src/nvim/autocmd.h
index b298fbb6a1..23c7810e14 100644
--- a/src/nvim/autocmd.h
+++ b/src/nvim/autocmd.h
@@ -39,7 +39,7 @@ EXTERN char *autocmd_fname INIT( = NULL);       ///< fname for <afile> on cmdlin
 EXTERN bool autocmd_fname_full INIT( = false);  ///< autocmd_fname is full path
 EXTERN int autocmd_bufnr INIT( = 0);            ///< fnum for <abuf> on cmdline
 EXTERN char *autocmd_match INIT( = NULL);       ///< name for <amatch> on cmdline
-EXTERN bool did_cursorhold INIT( = false);      ///< set when CursorHold t'gerd
+EXTERN bool did_cursorhold INIT( = true);       ///< set when CursorHold t'gerd
 
 typedef struct {
   win_T *auc_win;     ///< Window used in aucmd_prepbuf().  When not NULL the
diff --git a/test/functional/autocmd/cursorhold_spec.lua b/test/functional/autocmd/cursorhold_spec.lua
index c2815be5c6..178ed69833 100644
--- a/test/functional/autocmd/cursorhold_spec.lua
+++ b/test/functional/autocmd/cursorhold_spec.lua
@@ -69,6 +69,15 @@ describe('CursorHold', function()
     sleep(10)
     eq(1, api.nvim_get_var('cursorhold'))
   end)
+
+  it('is not triggered after only K_EVENT on startup', function()
+    api.nvim_set_option_value('updatetime', 20, {})
+    sleep(50)
+    eq(0, api.nvim_get_var('cursorhold'))
+    feed('0')
+    sleep(50)
+    eq(1, api.nvim_get_var('cursorhold'))
+  end)
 end)
 
 describe('CursorHoldI', function()