diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e29c982b..d6d890fdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and try to associate the created connection with this project automatically.
 * [#1450](https://github.com/clojure-emacs/cider/pull/1450): Fix an error in `cider-restart` caused by a reference to a killed buffer.
 * [#1459](https://github.com/clojure-emacs/cider/issues/1459): Add support for dynamic dispatch in scratch buffers.
 * [#1466](https://github.com/clojure-emacs/cider/issues/1466): Correctly font-lock pretty-printed results in the REPL.
+* [#1475](https://github.com/clojure-emacs/cider/pull/1475): Fix `args-out-of-range` error in `cider--get-symbol-indent`.
 
 ## 0.10.0 / 2015-12-03
 
diff --git a/cider-mode.el b/cider-mode.el
index 4eb6c6055..6ad29e5ab 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -289,7 +289,8 @@ Returns to the buffer in which the command was invoked."
       ;; There's no indent metadata, but there might be a clojure-mode
       ;; indent-spec with fully-qualified namespace.
       (when (string-match cider-resolve--prefix-regexp symbol-name)
-        (when-let ((sym (intern-soft (replace-match (cider-resolve-alias ns (match-string 1 symbol-name))
+        (when-let ((sym (intern-soft (replace-match (save-match-data
+                                                      (cider-resolve-alias ns (match-string 1 symbol-name)))
                                                     t t symbol-name 1))))
           (get sym 'clojure-indent-function))))))