diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim
index 9dd0cd4..f987ec0 100644
--- a/autoload/airline/extensions/whitespace.vim
+++ b/autoload/airline/extensions/whitespace.vim
@@ -62,7 +62,9 @@ endfunction!
 
 function! airline#extensions#whitespace#toggle()
   if s:enabled
-    autocmd! airline_whitespace CursorHold,BufWritePost
+    augroup airline_whitespace
+      autocmd!
+    augroup END
     augroup! airline_whitespace
     let s:enabled = 0
   else