diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index d32da371771..b7ac9e02e9f 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -600,8 +600,10 @@ references displayed in the current *xref* buffer."
 (define-derived-mode xref--xref-buffer-mode special-mode "XREF"
   "Mode for displaying cross-references."
   (setq buffer-read-only t)
-  (setq next-error-function #'xref--next-error-function)
-  (setq next-error-last-buffer (current-buffer)))
+  ;; FIXME: http://debbugs.gnu.org/20489
+  ;; (setq next-error-function #'xref--next-error-function)
+  ;; (setq next-error-last-buffer (current-buffer))
+  )
 
 (defun xref--next-error-function (n reset?)
   (when reset?