diff --git a/autoload/airline/extensions/tabline.vim b/autoload/airline/extensions/tabline.vim
index 8f2f9591..5b5b8c58 100644
--- a/autoload/airline/extensions/tabline.vim
+++ b/autoload/airline/extensions/tabline.vim
@@ -50,9 +50,12 @@ function! s:update_tabline()
     return
   endif
   " force re-evaluation of tabline setting
-  set mod!
-  redraw
-  set mod!
+  sil call feedkeys(":set mod!\n")
+  sil call feedkeys(":set mod!\n")
+  " disable explicit redraw, may cause E315
+  " https://groups.google.com/d/msg/vim_dev/fYl4dP1i9fo/rPT5f7h1DAAJ
+  "redraw
+  "set mod!
 endfunction
 
 function! airline#extensions#tabline#load_theme(palette)