diff --git a/autoload/SpaceVim/layers/ui.vim b/autoload/SpaceVim/layers/ui.vim
index 708b11633..ae35d7623 100644
--- a/autoload/SpaceVim/layers/ui.vim
+++ b/autoload/SpaceVim/layers/ui.vim
@@ -200,12 +200,7 @@ endfunction
 function! s:toggle_syntax_checker() abort
     call SpaceVim#layers#core#statusline#toggle_section('syntax checking')
     call SpaceVim#layers#core#statusline#toggle_mode('syntax-checking')
-    let g:_spacevim_toggle_syntax_flag = g:_spacevim_toggle_syntax_flag * -1
-    if g:_spacevim_toggle_syntax_flag == 1
-        echo 'syntax-checking enabled.'
-    else
-        echo 'syntax-checking disabled.'
-    endif
+    verbose NeomakeToggle
 endfunction
 
 function! s:toggle_spell_check() abort
diff --git a/config/plugins_before/neomake.vim b/config/plugins_before/neomake.vim
index b22a526b8..dbb550f02 100644
--- a/config/plugins_before/neomake.vim
+++ b/config/plugins_before/neomake.vim
@@ -1,23 +1,12 @@
+let s:neomake_automake_events = {}
 if get(g:, 'spacevim_lint_on_save', 0)
-    augroup Neomake_on_save
-        au!
-        autocmd! BufWritePost * call s:neomake()
-    augroup END
+    let s:neomake_automake_events['BufWritePost'] = {'delay': 0}
 endif
 
-let g:_spacevim_toggle_syntax_flag = 1
-
-function! s:neomake() abort
-    if g:_spacevim_toggle_syntax_flag == 1
-        Neomake
-    endif
-endfunction
-
 if get(g:, 'spacevim_lint_on_the_fly', 0)
-    let g:neomake_tempfile_enabled = 1
-    let g:neomake_open_list = 0
-    augroup Neomake_on_the_fly
-        au!
-        autocmd! TextChangedI * call s:neomake()
-    augroup END
+    let s:neomake_automake_events['TextChanged'] = {'delay': 750}
+endif
+
+if !empty(s:neomake_automake_events)
+    call neomake#configure#automake(s:neomake_automake_events)
 endif