diff --git a/plugin/denops.vim b/plugin/denops.vim
index 1bf3983a..8fc9f883 100644
--- a/plugin/denops.vim
+++ b/plugin/denops.vim
@@ -27,12 +27,13 @@ augroup END
 function! s:init() abort
   if !empty(get(g:, 'denops_server_addr'))
     if denops#server#connect()
+      call denops#server#wait_async({ -> denops#plugin#discover() })
       return
     endif
     " Fallback to a local denops server
   endif
   call denops#server#start()
-  call denops#server#wait_async({ -> denops#plugin#discover()})
+  call denops#server#wait_async({ -> denops#plugin#discover() })
 endfunction
 
 if has('vim_starting')