diff --git a/plugin/airline.vim b/plugin/airline.vim
index b47653a0..8a71d15f 100644
--- a/plugin/airline.vim
+++ b/plugin/airline.vim
@@ -76,10 +76,10 @@ function! s:init()
     call airline#extensions#load()
 
     let s:airline_theme_defined = exists('g:airline_theme')
-    if !airline#switch_matching_theme()
+    if !s:airline_theme_defined && !airline#switch_matching_theme()
       let g:airline_theme = get(g:, 'airline_theme', 'dark')
-      call airline#switch_theme(g:airline_theme)
     endif
+    call airline#switch_theme(g:airline_theme)
   endif
 endfunction