diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index 0dd356fcc..a676a1bac 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -99,19 +99,11 @@ If any hook returns non-nil, all hooks after it are ignored.")
                        (general--concat t doom-leader-key ,key)
                        ,desc)
                     wkforms))
-            ;; Don't bind missing functions (so they don't throw errors when
-            ;; used). `fboundp' conveniently returns `t' for autoloaded
-            ;; functions as well as defined ones.
-            (let* ((fn (if (general--extended-def-p unquoted-def)
-                           (plist-get unquoted-def :def)
-                         def))
-                   (unquoted-fn (doom-unquote fn)))
-              (when (or (not (symbolp unquoted-fn))
-                        (symbolp fn)
-                        (fboundp unquoted-fn))
-                (push `(define-key doom-leader-map (general--kbd ,key)
-                         ,fn)
-                      forms)))))))
+            (push `(define-key doom-leader-map (general--kbd ,key)
+                     ,(if (general--extended-def-p unquoted-def)
+                          (plist-get unquoted-def :def)
+                        def))
+                  forms)))))
     (macroexp-progn
      (append (nreverse forms)
              (when wkforms