diff --git a/layers/+lang/emacs-lisp/packages.el b/layers/+lang/emacs-lisp/packages.el
index 4f9a42d1d..efb3cf0c2 100644
--- a/layers/+lang/emacs-lisp/packages.el
+++ b/layers/+lang/emacs-lisp/packages.el
@@ -183,7 +183,8 @@
   (use-package nameless
     :defer t
     :init (progn
-            (add-hook 'emacs-lisp-mode-hook 'nameless-mode-from-hook)
+            (when (bound-and-true-p nameless-auto-mode)
+             (add-hook 'emacs-lisp-mode-hook 'nameless-mode-from-hook))
             (spacemacs|add-toggle nameless
               :status nameless-mode
               :on (nameless-mode)