diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index b231510df52..5a82bbd415d 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -14168,6 +14168,12 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                 runTest("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt");
             }
 
+            @Test
+            @TestMetadata("ifWithDependentBranches.kt")
+            public void testIfWithDependentBranches() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt");
+            }
+
             @Test
             @TestMetadata("illegalUnderscoredTypeArgument.kt")
             public void testIllegalUnderscoredTypeArgument() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 3ac14a19342..dfd79536f7e 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -14174,6 +14174,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                 runTest("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt");
             }
 
+            @Test
+            @TestMetadata("ifWithDependentBranches.kt")
+            public void testIfWithDependentBranches() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt");
+            }
+
             @Test
             @TestMetadata("illegalUnderscoredTypeArgument.kt")
             public void testIllegalUnderscoredTypeArgument() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index d062af2bba8..4502b796581 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -14168,6 +14168,12 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                 runTest("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt");
             }
 
+            @Test
+            @TestMetadata("ifWithDependentBranches.kt")
+            public void testIfWithDependentBranches() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt");
+            }
+
             @Test
             @TestMetadata("illegalUnderscoredTypeArgument.kt")
             public void testIllegalUnderscoredTypeArgument() throws Exception {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolutionMode.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolutionMode.kt
index 4e1adaa3b77..af53a9e2fec 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolutionMode.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolutionMode.kt
@@ -41,7 +41,18 @@ sealed class ResolutionMode(val forceFullCompletion: Boolean) {
         // In these examples we should try using the property type information while resolving the initializer,
         // but it's ok if it's not applicable
         val shouldBeStrictlyEnforced: Boolean = true,
-    ) : ResolutionMode(forceFullCompletion = true) {
+        // Currently the only case for expected type when we don't force completion are when's branches
+        forceFullCompletion: Boolean = true,
+    ) : ResolutionMode(forceFullCompletion) {
+
+        fun copy(
+            mayBeCoercionToUnitApplied: Boolean = this.mayBeCoercionToUnitApplied,
+            forceFullCompletion: Boolean = this.forceFullCompletion
+        ): WithExpectedType = WithExpectedType(
+            expectedTypeRef, mayBeCoercionToUnitApplied, expectedTypeMismatchIsReportedInChecker, fromCast, shouldBeStrictlyEnforced,
+            forceFullCompletion
+        )
+
         override fun toString(): String {
             return "WithExpectedType: ${expectedTypeRef.prettyString()}, " +
                     "mayBeCoercionToUnitApplied=${mayBeCoercionToUnitApplied}, " +
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
index 00e28b6db61..655ea3eeb00 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirControlFlowStatementsResolveTransformer.kt
@@ -74,12 +74,15 @@ class FirControlFlowStatementsResolveTransformer(transformer: FirAbstractBodyRes
                         // when with one branch cannot be completed if it's not already complete in the first place
                     }
                     else -> {
+                        val resolutionModeForBranches =
+                            (data as? ResolutionMode.WithExpectedType)
+                                // Currently we don't use information from cast, but probably we could have
+                                ?.takeUnless { it.fromCast }
+                                ?.copy(forceFullCompletion = false)
+                                ?: ResolutionMode.ContextDependent
                         whenExpression = whenExpression.transformBranches(
                             transformer,
-                            data.takeIf {
-                                val expectedType = it.expectedType
-                                expectedType != null && expectedType !is FirImplicitTypeRef
-                            } ?: ResolutionMode.ContextDependent,
+                            resolutionModeForBranches,
                         )
 
                         whenExpression = syntheticCallGenerator.generateCalleeForWhenExpression(whenExpression, resolutionContext) ?: run {
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
index c46c8eba5d8..b00ec8419df 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
@@ -518,7 +518,7 @@ open class FirExpressionsResolveTransformer(transformer: FirAbstractBodyResolveT
             val value =
                 if (index == numberOfStatements - 1)
                     if (data is ResolutionMode.WithExpectedType)
-                        ResolutionMode.WithExpectedType(data.expectedTypeRef, mayBeCoercionToUnitApplied = true)
+                        data.copy(mayBeCoercionToUnitApplied = true)
                     else
                         data
                 else
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
index bc955bc78e2..ba8d25dc29a 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
@@ -26,7 +26,7 @@ fun <T> bind2(r: Option<T>): Option<T> {
 fun <T, R> bind3(r: Option<T>): Option<T> {
     return <!RETURN_TYPE_MISMATCH!>if (r is Some) {
         // Diagnoses an error correctly
-        <!TYPE_MISMATCH!>if (true) <!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>None<R>()<!> else r<!>
+        if (true) None<R>() else r
     }
     else r<!>
 }
diff --git a/compiler/testData/diagnostics/tests/generics/kt53656.fir.kt b/compiler/testData/diagnostics/tests/generics/kt53656.fir.kt
index d8858e99ac8..bb429822a01 100644
--- a/compiler/testData/diagnostics/tests/generics/kt53656.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt53656.fir.kt
@@ -5,7 +5,7 @@ interface Entity<T>
 abstract class SecuredEntity<out E>(val entity: E) where E : Entity<Int>, E : SecurityCodeAware<*,*>
 interface SecurityCodeAware<out E, R : SecuredEntity<E>> where E : Entity<Int>, E : SecurityCodeAware<E, R>
 fun <E, R : SecuredEntity<E>> SecurityCodeAware<E, R>.secured() : R where E : Entity<Int>, E : SecurityCodeAware<E, R> = <!RETURN_TYPE_MISMATCH!>when(this) {
-    is Order -> <!TYPE_MISMATCH!>SecuredOrder(this)<!>
+    is Order -> SecuredOrder(this)
     else -> null!!
 }<!>
 class Order : Entity<Int>
diff --git a/compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.fir.kt b/compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.fir.kt
new file mode 100644
index 00000000000..033680524ff
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.fir.kt
@@ -0,0 +1,62 @@
+// SKIP_TXT
+
+interface Additional
+interface A<T> : Additional
+
+fun <U> aOf(): A<U> = TODO()
+
+interface B<E>
+
+fun <F> B<F>.convert(): A<F> = TODO()
+
+fun foo1(x: B<String>): Any {
+    return if (x.hashCode() == 0) aOf() else x.convert()
+}
+
+fun foo2(x: B<String>): Additional {
+    return if (x.hashCode() == 0) aOf() else x.convert()
+}
+
+fun foo3(x: B<String>): Any {
+    return when {
+        x.hashCode() == 0 -> aOf()
+        else -> x.convert()
+    }
+}
+
+fun foo4(x: B<String>): Additional {
+    return when {
+        x.hashCode() == 0 -> aOf()
+        else -> x.convert()
+    }
+}
+
+fun foo5(x: B<String>): Any {
+    return if (x.hashCode() == 0) {
+        aOf()
+    } else {
+        x.convert()
+    }
+}
+
+fun foo6(x: B<String>): Additional {
+    return if (x.hashCode() == 0) {
+        aOf()
+    } else {
+        x.convert()
+    }
+}
+
+fun foo7(x: B<String>): Any {
+    return when {
+        x.hashCode() == 0 -> { aOf() }
+        else -> { x.convert() }
+    }
+}
+
+fun foo8(x: B<String>): Additional {
+    return when {
+        x.hashCode() == 0 -> { aOf() }
+        else -> { x.convert() }
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt b/compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt
new file mode 100644
index 00000000000..ffec5988699
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt
@@ -0,0 +1,62 @@
+// SKIP_TXT
+
+interface Additional
+interface A<T> : Additional
+
+fun <U> aOf(): A<U> = TODO()
+
+interface B<E>
+
+fun <F> B<F>.convert(): A<F> = TODO()
+
+fun foo1(x: B<String>): Any {
+    return if (x.hashCode() == 0) aOf() else x.convert()
+}
+
+fun foo2(x: B<String>): Additional {
+    return if (x.hashCode() == 0) <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>aOf<!>() else x.convert()
+}
+
+fun foo3(x: B<String>): Any {
+    return when {
+        x.hashCode() == 0 -> aOf()
+        else -> x.convert()
+    }
+}
+
+fun foo4(x: B<String>): Additional {
+    return when {
+        x.hashCode() == 0 -> <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>aOf<!>()
+        else -> x.convert()
+    }
+}
+
+fun foo5(x: B<String>): Any {
+    return if (x.hashCode() == 0) {
+        aOf()
+    } else {
+        x.convert()
+    }
+}
+
+fun foo6(x: B<String>): Additional {
+    return if (x.hashCode() == 0) {
+        <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>aOf<!>()
+    } else {
+        x.convert()
+    }
+}
+
+fun foo7(x: B<String>): Any {
+    return when {
+        x.hashCode() == 0 -> { aOf() }
+        else -> { x.convert() }
+    }
+}
+
+fun foo8(x: B<String>): Additional {
+    return when {
+        x.hashCode() == 0 -> { <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>aOf<!>() }
+        else -> { x.convert() }
+    }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.fir.kt
new file mode 100644
index 00000000000..21c46587a59
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.fir.kt
@@ -0,0 +1,7 @@
+// !DIAGNOSTICS: -UNUSED_VARIABLE
+
+fun foo() {
+    val s: String? = if (true) <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Nothing?")!>materialize()<!> else null
+}
+
+fun <K> materialize(): K = TODO()
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.kt b/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.kt
index 57c9839179b..e52674c522d 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/specialCallWithMaterializeAndExpectedType.kt
@@ -1,4 +1,3 @@
-// FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun foo() {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 4072b774ad4..9ca733aabfa 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -14174,6 +14174,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                 runTest("compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.kt");
             }
 
+            @Test
+            @TestMetadata("ifWithDependentBranches.kt")
+            public void testIfWithDependentBranches() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/ifWithDependentBranches.kt");
+            }
+
             @Test
             @TestMetadata("illegalUnderscoredTypeArgument.kt")
             public void testIllegalUnderscoredTypeArgument() throws Exception {