diff --git a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
index c2c13e899ef4..1fee0f52f770 100644
--- a/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
+++ b/compiler/src/dotty/tools/dotc/parsing/Scanners.scala
@@ -1168,7 +1168,9 @@ object Scanners {
           finishNamedToken(IDENTIFIER, target = next)
         }
         else
-          error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected")
+          error("invalid string interpolation: `$$`, `$\"`, `$`ident or `$`BlockExpr expected", off = charOffset - 2)
+          putChar('$')
+          getStringPart(multiLine)
       }
       else {
         val isUnclosedLiteral = !isUnicodeEscape && (ch == SU || (!multiLine && (ch == CR || ch == LF)))
diff --git a/tests/neg/interpolator-dollar.check b/tests/neg/interpolator-dollar.check
new file mode 100644
index 000000000000..2de0c843725e
--- /dev/null
+++ b/tests/neg/interpolator-dollar.check
@@ -0,0 +1,4 @@
+-- Error: tests/neg/interpolator-dollar.scala:5:20 ---------------------------------------------------------------------
+5 |  def oops = f"$s%s $<s" // error: invalid string interpolation
+  |                    ^
+  |                    invalid string interpolation: `$$`, `$"`, `$`ident or `$`BlockExpr expected
diff --git a/tests/neg/interpolator-dollar.scala b/tests/neg/interpolator-dollar.scala
new file mode 100644
index 000000000000..b22bd58220b8
--- /dev/null
+++ b/tests/neg/interpolator-dollar.scala
@@ -0,0 +1,6 @@
+
+trait T {
+  def s = { println("SSS") ; "hello" }
+  def ok = String.format("%s, %<s", s)
+  def oops = f"$s%s $<s" // error: invalid string interpolation
+}