diff --git a/autoload/SpaceVim/layers/lang.vim b/autoload/SpaceVim/layers/lang.vim
index 1b1769c9d..37feadd54 100644
--- a/autoload/SpaceVim/layers/lang.vim
+++ b/autoload/SpaceVim/layers/lang.vim
@@ -28,7 +28,6 @@ function! SpaceVim#layers#lang#plugins() abort
                 \ ['isundil/vim-irssi-syntax',               { 'on_ft' : 'irssi'}],
                 \ ['lervag/vimtex',                          { 'on_ft' : 'tex'}],
                 \ ['vimperator/vimperator.vim',              { 'on_ft' : 'vimperator'}],
-                \ ['fatih/vim-go',                           { 'on_ft' : 'go', 'loadconf_before' : 1}],
                 \ ['rust-lang/rust.vim',            {'merged' : 1}],
                 \ ] 
     " python
diff --git a/autoload/SpaceVim/layers/lang/go.vim b/autoload/SpaceVim/layers/lang/go.vim
new file mode 100644
index 000000000..8d58eced0
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/go.vim
@@ -0,0 +1,12 @@
+function! SpaceVim#layers#lang#go#plugins() abort
+    if has('nvim')
+        return ['zchee/deoplete-go', {'on_ft' : 'go'}]
+    else
+        return ['fatih/vim-go', { 'on_ft' : 'go', 'loadconf_before' : 1}]
+    endif
+endfunction
+
+
+function! SpaceVim#layers#lang#go#config() abort
+    
+endfunction