diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d795cfc..801fa4ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Bugs fixed
+
+* Make `clojure-match-next-def` more robust against zero-arity def-like forms.
+
 ### New features
 
 * New interactive command `clojure-cycle-when`.
diff --git a/clojure-mode.el b/clojure-mode.el
index b8c1282b..228d4f56 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -664,7 +664,9 @@ Called by `imenu--generic-function'."
         (down-list)
         (forward-sexp)
         (while (not found?)
-          (forward-sexp)
+          (condition-case nil
+              (forward-sexp)
+            (error nil))
           (or (if (char-equal ?[ (char-after (point)))
                               (backward-sexp))
                   (if (char-equal ?) (char-after (point)))