diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
index de7218e40ca..78449608243 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirCallCompleter.kt
@@ -184,7 +184,7 @@ class FirCallCompleter(
                     )
                 }
             }
-            !expectedType.isUnitOrFlexibleUnit || !mayBeCoercionToUnitApplied -> {
+            !expectedType.isUnitOrFlexibleUnit || (!mayBeCoercionToUnitApplied && !expectedTypeMismatchIsReportedInChecker) -> {
                 system.addSubtypeConstraint(initialType, expectedType, expectedTypeConstraintPosition)
             }
             system.notFixedTypeVariables.isEmpty() -> return
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
index 90c53a98a77..1eb65c77223 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
@@ -27,7 +27,7 @@ fun testResultOfAnonFun2() =
 
 fun testReturnFromAnonFun() =
         run(fun () {
-            return if (true) 42 else println()
+            return <!ARGUMENT_TYPE_MISMATCH, RETURN_TYPE_MISMATCH!>if (true) 42 else println()<!>
         })
 
 fun <!IMPLICIT_NOTHING_RETURN_TYPE!>testReturn1<!>() =
diff --git a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
index 76b57021448..cb7dceee010 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
@@ -29,5 +29,5 @@ fun example() {
         return <!INVALID_IF_AS_EXPRESSION!>if<!> (true) true
     }
 
-    return if (true) true else {}
+    return <!RETURN_TYPE_MISMATCH!>if (true) true else {}<!>
 }