diff --git a/autoload/youcompleteme.vim b/autoload/youcompleteme.vim
index b8129ee4..08989b0d 100644
--- a/autoload/youcompleteme.vim
+++ b/autoload/youcompleteme.vim
@@ -76,7 +76,7 @@ function! s:OnBufferVisit()
   call s:SetCompleteFunc()
   py identcomp.OnFileEnter()
 
-  if pyeval('ycm.ClangAvailableForFile()')
+  if g:ycm_clang_completion_enabled && pyeval('ycm.ClangAvailableForFile()')
     py clangcomp.OnFileEnter()
   endif
 endfunction