diff --git a/autoload/airline.vim b/autoload/airline.vim
index 63fc270..7da3ff2 100644
--- a/autoload/airline.vim
+++ b/autoload/airline.vim
@@ -26,7 +26,6 @@ function! airline#add_inactive_statusline_func(name)
 endfunction
 
 function! airline#load_theme()
-  highlight! default link airline_warning WarningMsg
   call airline#highlighter#load_theme()
   call airline#extensions#load_theme()
 endfunction
diff --git a/autoload/airline/themes.vim b/autoload/airline/themes.vim
index d4ec32b..0d9158d 100644
--- a/autoload/airline/themes.vim
+++ b/autoload/airline/themes.vim
@@ -54,6 +54,12 @@ function! airline#themes#get_highlight2(fg, bg, ...)
 endfunction
 
 function! airline#themes#patch(palette)
+  for mode in keys(a:palette)
+    if !has_key(a:palette[mode], 'airline_warning')
+      let a:palette[mode]['airline_warning'] = [ '#000000', '#df5f00', 232, 166 ]
+    endif
+  endfor
+
   " this is a pretty heavy handed, but it works...
   " basically, look for the 'airline_file' group and copy the bg
   " colors from 'airline_c' into it.