diff --git a/autoload/SpaceVim/server.vim b/autoload/SpaceVim/server.vim
index edb011ff8..985cef77f 100644
--- a/autoload/SpaceVim/server.vim
+++ b/autoload/SpaceVim/server.vim
@@ -11,7 +11,7 @@
 
 function! SpaceVim#server#connect()
   if empty($SPACEVIM_SERVER_ADDRESS)
-    let $SPACEVIM_SERVER_ADDRESS = fnamemodify('~/.cache/SpaceVim/server', ':p')
+    let $SPACEVIM_SERVER_ADDRESS = fnamemodify('/tmp/' . (has('nvim') ? 'spacevim_nvim_' : 'spacevim_vim_') . 'server', ':p')
   endif
   if has('nvim')
     try
@@ -19,6 +19,11 @@ function! SpaceVim#server#connect()
       call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS)
     catch /Failed to start server: address already in use/
     endtry
+  elseif exists('*remote_startserver')
+    if index(split(serverlist(), "\n"), $SPACEVIM_SERVER_ADDRESS) == -1
+      call remote_startserver($SPACEVIM_SERVER_ADDRESS)
+      call SpaceVim#logger#info('SpaceVim server startup at:' . $SPACEVIM_SERVER_ADDRESS)
+    endif
   endif
 endfunction
 
diff --git a/bin/nsvc b/bin/nsvc
new file mode 100755
index 000000000..a9abf0565
--- /dev/null
+++ b/bin/nsvc
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+#=============================================================================
+# SpaceVim client mode
+# Copyright (c) 2016-2017 Shidong Wang & Contributors
+# Author: Shidong Wang < wsdjeg at 163.com >
+# URL: https://spacevim.org
+# License: MIT license
+#=============================================================================
+
+nvr --servername /tmp/spacevim_nvim_server --remote $@
diff --git a/bin/svc b/bin/svc
index 1ca909b7e..de13f896a 100755
--- a/bin/svc
+++ b/bin/svc
@@ -8,4 +8,4 @@
 # License: MIT license
 #=============================================================================
 
-nvr --servername ~/.cache/SpaceVim/server --remote $@
+/usr/bin/vim --servername /tmp/spacevim_vim_server --remote-silent $@