diff --git a/modules/lang/go/config.el b/modules/lang/go/config.el
index d3adb7348..b29047ffa 100644
--- a/modules/lang/go/config.el
+++ b/modules/lang/go/config.el
@@ -4,10 +4,6 @@
 ;; Packages
 
 (after! go-mode
-  (if (featurep! +lsp)
-      (add-hook 'go-mode-hook #'lsp!)
-    (add-hook 'go-mode-hook #'go-eldoc-setup))
-
   (set-docsets! 'go-mode "Go")
   (set-repl-handler! 'go-mode #'gorepl-run)
   (set-lookup-handlers! 'go-mode
@@ -23,6 +19,10 @@
                 "gofmt"
               "goimports"))))
 
+  (if (featurep! +lsp)
+      (add-hook 'go-mode-local-vars-hook #'lsp!)
+    (add-hook 'go-mode-hook #'go-eldoc-setup))
+
   (map! :map go-mode-map
         :localleader
         "e" #'+go/play-buffer-or-region