diff --git a/core/core.el b/core/core.el
index 961f82733..429289344 100644
--- a/core/core.el
+++ b/core/core.el
@@ -612,7 +612,7 @@ to least)."
     (eval-after-load 'straight '(doom-initialize-packages))
 
     ;; Bootstrap our GC manager
-    (add-hook 'doom-first-input-hook #'gcmh-mode)
+    (add-hook 'doom-first-buffer-hook #'gcmh-mode)
 
     ;; Bootstrap the interactive session
     (add-hook 'after-change-major-mode-hook #'doom-run-local-var-hooks-h)
diff --git a/modules/tools/lsp/config.el b/modules/tools/lsp/config.el
index c105ef365..c09e1c050 100644
--- a/modules/tools/lsp/config.el
+++ b/modules/tools/lsp/config.el
@@ -41,8 +41,6 @@ killing and opening many LSP/eglot-powered buffers.")
       ;;        GC strategy, so we modify its variables rather than
       ;;        `gc-cons-threshold' directly.
       (setq-default gcmh-high-cons-threshold (* 2 +lsp--default-gcmh-high-cons-threshold))
-      (unless (bound-and-true-p gcmh-mode)
-        (gcmh-mode +1))
       (gcmh-set-high-threshold)
       (setq +lsp--optimization-init-p t))))