diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4047b002..189dbd93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bugs fixed
+
+* Fix `clojure-paredent-setup` to apply to `edn-mode-map` as well as `clojure-mode-map`.
+
 ## 5.22.0 (2026-03-03)
 
 ### New features
diff --git a/clojure-mode.el b/clojure-mode.el
index 5e249a84..674197d0 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -586,14 +586,14 @@ bracket.")
       (clojure--replace-sexps-with-bindings-and-indent))))
 
 (defun clojure-paredit-setup (&optional keymap)
-  "Make \"paredit-mode\" play nice with `clojure-mode'.
+  "Make \"paredit-mode\" play nice with `clojure-mode and `edn-mode'.
 
 If an optional KEYMAP is passed the changes are applied to it,
 instead of to `clojure-mode-map'.
 Also advice `paredit-convolute-sexp' when used on a let form as drop in
 replacement for `cljr-expand-let`."
   (when (>= paredit-version 21)
-    (let ((keymap (or keymap clojure-mode-map)))
+    (let ((keymap (or keymap (current-local-map))))
       (define-key keymap "{" #'paredit-open-curly)
       (define-key keymap "}" #'paredit-close-curly))
     (make-local-variable 'paredit-space-for-delimiter-predicates)