diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
index f3fac882c2..d8bf207b7f 100644
--- a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
+++ b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/Router.scala
@@ -2308,8 +2308,7 @@ class Router(formatOps: FormatOps) {
         val lastToken = getLastToken(leftOwner.asInstanceOf[Term.ForYield].body)
         val indent = Indent(style.indent.main, lastToken, ExpiresOn.After)
         if (style.newlines.avoidAfterYield && !rightOwner.is[Term.If]) {
-          val nextFt = nextNonCommentSameLine(ft)
-          val noIndent = nextFt.eq(ft) || nextFt.noBreak
+          val noIndent = !isRightCommentWithBreak(ft)
           Seq(Split(Space, 0).withIndent(indent, noIndent))
         } else Seq(
           // Either everything fits in one line or break on =>
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
index 2c4c4f9fab..7f52a02c29 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_classic.stat
@@ -9718,20 +9718,20 @@ class ClassEmitter {
       for {
         chainProto <- chainProtoWithGlobals
       } yield
-      // Real constructor
-      js.JSDocConstructor(realCtorDef.head) ::
-        realCtorDef.tail :::
-        chainProto :::
-        (genIdentBracketSelect(
-          prototypeFor(ctorVar),
-          "constructor"
-        ) := ctorVar) ::
-        // Inheritable constructor
-        js.JSDocConstructor(inheritableCtorDef.head) ::
-        inheritableCtorDef.tail :::
-        (globalVar(VarField.h, className).prototype := prototypeFor(
-          ctorVar
-        )) :: Nil
+        // Real constructor
+        js.JSDocConstructor(realCtorDef.head) ::
+          realCtorDef.tail :::
+          chainProto :::
+          (genIdentBracketSelect(
+            prototypeFor(ctorVar),
+            "constructor"
+          ) := ctorVar) ::
+          // Inheritable constructor
+          js.JSDocConstructor(inheritableCtorDef.head) ::
+          inheritableCtorDef.tail :::
+          (globalVar(VarField.h, className).prototype := prototypeFor(
+            ctorVar
+          )) :: Nil
     }
 
 }
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
index a7d47c54b2..3e3e06adff 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_fold.stat
@@ -9117,16 +9117,16 @@ class ClassEmitter {
       for {
         chainProto <- chainProtoWithGlobals
       } yield
-      // Real constructor
-      js.JSDocConstructor(realCtorDef.head) :: realCtorDef.tail :::
-        chainProto :::
-        (genIdentBracketSelect(prototypeFor(ctorVar), "constructor") :=
-          ctorVar) ::
-        // Inheritable constructor
-        js.JSDocConstructor(inheritableCtorDef.head) ::
-        inheritableCtorDef.tail :::
-        (globalVar(VarField.h, className).prototype := prototypeFor(ctorVar)) ::
-        Nil
+        // Real constructor
+        js.JSDocConstructor(realCtorDef.head) :: realCtorDef.tail :::
+          chainProto :::
+          (genIdentBracketSelect(prototypeFor(ctorVar), "constructor") :=
+            ctorVar) ::
+          // Inheritable constructor
+          js.JSDocConstructor(inheritableCtorDef.head) ::
+          inheritableCtorDef.tail :::
+          (globalVar(VarField.h, className).prototype :=
+            prototypeFor(ctorVar)) :: Nil
     }
 
 }
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
index 65b9d91b5a..752f3c95d9 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_keep.stat
@@ -9515,21 +9515,21 @@ class ClassEmitter {
       for {
         chainProto <- chainProtoWithGlobals
       } yield
-      // Real constructor
-      js.JSDocConstructor(realCtorDef.head) ::
-        realCtorDef.tail :::
-        chainProto :::
-        (genIdentBracketSelect(
-          prototypeFor(ctorVar),
-          "constructor"
-        ) := ctorVar) ::
-        // Inheritable constructor
-        js.JSDocConstructor(inheritableCtorDef.head) ::
-        inheritableCtorDef.tail :::
-        (globalVar(
-          VarField.h,
-          className
-        ).prototype := prototypeFor(ctorVar)) :: Nil
+        // Real constructor
+        js.JSDocConstructor(realCtorDef.head) ::
+          realCtorDef.tail :::
+          chainProto :::
+          (genIdentBracketSelect(
+            prototypeFor(ctorVar),
+            "constructor"
+          ) := ctorVar) ::
+          // Inheritable constructor
+          js.JSDocConstructor(inheritableCtorDef.head) ::
+          inheritableCtorDef.tail :::
+          (globalVar(
+            VarField.h,
+            className
+          ).prototype := prototypeFor(ctorVar)) :: Nil
     }
 
 }
diff --git a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
index 202cf9e1c5..40b65b3a7b 100644
--- a/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
+++ b/scalafmt-tests/shared/src/test/resources/newlines/source_unfold.stat
@@ -9797,16 +9797,16 @@ class ClassEmitter {
       for {
         chainProto <- chainProtoWithGlobals
       } yield
-      // Real constructor
-      js.JSDocConstructor(realCtorDef.head) :: realCtorDef.tail :::
-        chainProto :::
-        (genIdentBracketSelect(prototypeFor(ctorVar), "constructor") :=
-          ctorVar) ::
-        // Inheritable constructor
-        js.JSDocConstructor(inheritableCtorDef.head) ::
-        inheritableCtorDef.tail :::
-        (globalVar(VarField.h, className).prototype := prototypeFor(ctorVar)) ::
-        Nil
+        // Real constructor
+        js.JSDocConstructor(realCtorDef.head) :: realCtorDef.tail :::
+          chainProto :::
+          (genIdentBracketSelect(prototypeFor(ctorVar), "constructor") :=
+            ctorVar) ::
+          // Inheritable constructor
+          js.JSDocConstructor(inheritableCtorDef.head) ::
+          inheritableCtorDef.tail :::
+          (globalVar(VarField.h, className).prototype :=
+            prototypeFor(ctorVar)) :: Nil
     }
 
 }