diff --git a/nrepl-client.el b/nrepl-client.el
index 94cd25324..8d5773f6a 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -824,7 +824,8 @@ It is safe to call this function multiple times on the same ID."
 
 (defun nrepl-make-response-handler (buffer value-handler stdout-handler
                                            stderr-handler done-handler
-                                           &optional eval-error-handler)
+                                           &optional eval-error-handler
+                                           pprint-out-handler)
   "Make a response handler for connection BUFFER.
 A handler is a function that takes one argument - response received from
 the server process.  The response is an alist that contains at least 'id'
@@ -855,8 +856,8 @@ server responses."
              (when stdout-handler
                (funcall stdout-handler buffer out)))
             (pprint-out
-             (when stdout-handler
-               (funcall stdout-handler buffer pprint-out)))
+             (cond (pprint-out-handler (funcall pprint-out-handler buffer pprint-out))
+                   (stdout-handler (funcall stdout-handler buffer pprint-out))))
             (err
              (when stderr-handler
                (funcall stderr-handler buffer err)))