diff --git a/core/core-editor.el b/core/core-editor.el
index c2baf18c4..844863ba2 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -132,8 +132,7 @@ fundamental-mode) for performance sake."
 
 ;; Auto-close delimiters and blocks as you type
 (def-package! smartparens
-  :defer pre-command-hook
-  :commands (sp-pair sp-local-pair sp-with-modes)
+  :defer doom-before-switch-buffer-hook
   :config
   (require 'smartparens-config)
   (setq sp-highlight-pair-overlay nil