diff --git a/neovim/init.vim b/neovim/init.vim
index 29b65e1..a57082f 100644
--- a/neovim/init.vim
+++ b/neovim/init.vim
@@ -221,6 +221,7 @@ let g:python_highlight_all = 1
 
 " Disable vim-go's gd mapping now that nvim-lspconfig uses it.
 let g:go_def_mapping_enabled = 0
+let g:go_fmt_command = "gopls"
 let g:go_highlight_build_constraints = 1
 let g:go_highlight_interfaces = 1
 let g:go_highlight_functions = 1
@@ -228,7 +229,6 @@ let g:go_highlight_methods = 1
 let g:go_highlight_operators = 1
 let g:go_highlight_structs = 1
 let g:go_highlight_types = 1
-let g:go_fmt_command = "goimports"
 
 let g:buffergator_viewport_split_policy = 'B'
 let g:buffergator_autoupdate = 1