diff --git a/layers/+lang/emacs-lisp/packages.el b/layers/+lang/emacs-lisp/packages.el
index 47f9ef74a..cef7a3e5c 100644
--- a/layers/+lang/emacs-lisp/packages.el
+++ b/layers/+lang/emacs-lisp/packages.el
@@ -75,10 +75,13 @@
           "dF" 'spacemacs/edebug-instrument-defun-off))
       ;; since we evilify `edebug-mode-map' we don't need to intercept it to
       ;; make it work with evil
-      (custom-set-variables
-       '(evil-intercept-maps
-         (delq (assq 'edebug-mode-map evil-intercept-maps)
-               evil-intercept-maps)))
+     (evil-set-custom-state-maps
+      'evil-intercept-maps
+      'evil-pending-intercept-maps
+      'intercept-state
+      'evil-make-intercept-map
+      (delq (assq 'edebug-mode-map evil-intercept-maps)
+            evil-intercept-maps))
       (evilified-state-evilify-map edebug-mode-map
         :eval-after-load edebug
         :bindings