diff --git a/CHANGES.md b/CHANGES.md
index c8fa5406ba..24cfe103b4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ merlin NEXT_VERSION
       #1704)
   + editor modes
     - vim: load merlin when Vim is compiled with +python3/dyn (e.g. MacVim)
+    - emacs: highlight only first error line by default (#1693, fixes #1663)
 
 merlin 4.12
 ===========
diff --git a/emacs/merlin.el b/emacs/merlin.el
index 3f79d97481..9100dfa360 100644
--- a/emacs/merlin.el
+++ b/emacs/merlin.el
@@ -153,7 +153,7 @@ If a string list, check only if the extension of the buffer-file-name
   "If non-nil, display errors in fringe"
   :group 'merlin :type 'boolean)
 
-(defcustom merlin-error-on-single-line nil
+(defcustom merlin-error-on-single-line t
   "Only highlight first line of multi-line error messages"
   :group 'merlin :type 'boolean)