diff --git a/core/core-editor.el b/core/core-editor.el
index 69d912f56..6f7b3bec4 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -195,7 +195,16 @@
     (sp-local-pair "/*" "" :post-handlers '((" ||\n[i]*/" "RET"))))
 
   (after! yasnippet
-    (advice-add 'yas-expand :before 'sp-remove-active-pair-overlay)))
+    (advice-add 'yas-expand :before 'sp-remove-active-pair-overlay))
+
+  (after! web-mode
+    (add-hook! web-mode (setq web-mode-enable-auto-pairing nil))
+    (defun sp-web-mode-is-code-context (id action context)
+      (when (and (eq action 'insert)
+                 (not (or (get-text-property (point) 'part-side)
+                          (get-text-property (point) 'block-side))))
+        t))
+    (sp-local-pair 'web-mode "<" nil :when '(sp-web-mode-is-code-context))))
 
 (use-package smex
   :commands (smex smex-major-mode-commands smex-initialize smex-update)
diff --git a/modules/module-web.el b/modules/module-web.el
index b9cf074ca..e8973bfff 100644
--- a/modules/module-web.el
+++ b/modules/module-web.el
@@ -23,16 +23,6 @@
         web-mode-script-padding        2
         web-mode-block-padding         2)
   :config
-  (after! smartparens
-    (add-hook! web-mode (setq web-mode-enable-auto-pairing nil))
-
-    (defun sp-web-mode-is-code-context (id action context)
-      (when (and (eq action 'insert)
-                 (not (or (get-text-property (point) 'part-side)
-                          (get-text-property (point) 'block-side))))
-        t))
-    (sp-local-pair 'web-mode "<" nil :when '(sp-web-mode-is-code-context)))
-
   (after! web-beautify
     (add-hook! web-mode (setenv "jsbeautify_indent_size" "4"))
     (bind! :map web-mode-map :m "gQ" 'web-beautify-html))