diff --git a/core/defuns/macros-yasnippet.el b/core/defuns/macros-yasnippet.el
index d355f35af..3ceab5c58 100644
--- a/core/defuns/macros-yasnippet.el
+++ b/core/defuns/macros-yasnippet.el
@@ -4,11 +4,10 @@
 (defmacro def-yas-mode! (mode)
   "Register minor MODES in yasnippet."
   `(after! yasnippet
-     (when (boundp 'yas--extra-modes)
-       (add-hook! ,mode
-         (if (symbol-value ,mode)
-             (yas-activate-extra-mode ,mode)
-           (yas-deactivate-extra-mode ,mode))))))
+     (add-hook! ,mode
+       (if ,mode
+           (yas-activate-extra-mode ,mode)
+         (yas-deactivate-extra-mode ,mode)))))
 
 (provide 'macros-yasnippet)
 ;;; macros-yasnippet.el ends here