diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index 2d381277..7489c761 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -251,6 +251,7 @@ function! airline#extensions#load()
   endif
   if get(g:, 'airline#extensions#taglist#enabled', 1)
         \ && exists(':TlistShowTag')
+        \ && exists('*taglist#Tlist_Get_Tagname_By_Line')
     call airline#extensions#taglist#init(s:ext)
     call add(s:loaded_ext, 'taglist')
   endif
diff --git a/autoload/airline/extensions/taglist.vim b/autoload/airline/extensions/taglist.vim
index 021a2210..430662a9 100644
--- a/autoload/airline/extensions/taglist.vim
+++ b/autoload/airline/extensions/taglist.vim
@@ -4,7 +4,7 @@
 
 scriptencoding utf-8
 
-if !exists(':TlistShowTag')
+if !exists(':TlistShowTag') && !exists('*taglist#Tlist_Get_Tagname_By_Line')
   finish
 endif