diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index cc0d6cdb6..f7f326cb4 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -110,7 +110,10 @@ all hooks after it are ignored.")
   :init
   ;; Convenience aliases
   (defalias 'define-key! #'general-def)
-  (defalias 'undefine-key! #'general-unbind))
+  (defalias 'undefine-key! #'general-unbind)
+  :config
+  ;; Prevent "X starts with non-prefix key Y" errors except at startup.
+  (add-hook 'doom-after-init-modules-hook #'general-auto-unbind-keys))
 
 
 ;; HACK `map!' uses this instead of `define-leader-key!' because it consumes