diff --git a/autoload/youcompleteme.vim b/autoload/youcompleteme.vim
index aacbf6e95c..9508bbff4d 100644
--- a/autoload/youcompleteme.vim
+++ b/autoload/youcompleteme.vim
@@ -766,6 +766,10 @@ function! s:OnBufferEnter()
     return
   endif
 
+  if g:ycm_auto_hover ==# 'CursorHold' && s:enable_hover
+    call s:StopPoller( s:pollers.command )
+  endif
+
   call s:SetUpCompleteopt()
   call s:EnableCompletingInCurrentBuffer()
 
@@ -966,6 +970,10 @@ function! s:OnCursorMovedNormalMode()
     return
   endif
 
+  if g:ycm_auto_hover ==# 'CursorHold' && s:enable_hover
+    call s:StopPoller( s:pollers.command )
+  endif
+
   py3 ycm_state.OnCursorMoved()
 endfunction