diff --git a/main/src/main/scala/sbt/internals/parser/SbtParser.scala b/main/src/main/scala/sbt/internals/parser/SbtParser.scala
index 6050d08be..583375f88 100644
--- a/main/src/main/scala/sbt/internals/parser/SbtParser.scala
+++ b/main/src/main/scala/sbt/internals/parser/SbtParser.scala
@@ -98,10 +98,9 @@ private[sbt] case class SbtParser(file: File, lines: Seq[String]) extends Parsed
     // Check No val (a,b) = foo *or* val a,b = foo as these are problematic to range positions and the WHOLE architecture.
     def isBadValDef(t: Tree): Boolean =
       t match {
-        case (x @ (toolbox.u.ValDef(_, _, _, _) | toolbox.u.DefDef(_, _, _, _, _, _))) =>
+        case x @ toolbox.u.ValDef(_, _, _, rhs) if rhs != toolbox.u.EmptyTree =>
           val content = modifiedContent.substring(x.pos.start, x.pos.end)
-          val prettyPrint = x.toString
-          (!(content contains "=") && (prettyPrint contains "="))
+          !(content contains "=")
         case _ => false
       }
     parsedTrees.filter(isBadValDef).foreach { badTree =>