diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
index d1c01d3c1fe..bd590ca4ce0 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/FirOldFrontendDiagnosticsTestGenerated.java
@@ -11310,6 +11310,16 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirOldFronte
                 runTest("compiler/testData/diagnostics/tests/inference/regressions/kt35943.kt");
             }
 
+            @TestMetadata("kt36342.kt")
+            public void testKt36342() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt");
+            }
+
+            @TestMetadata("kt36342_2.kt")
+            public void testKt36342_2() throws Exception {
+                runTest("compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt");
+            }
+
             @TestMetadata("kt4420.kt")
             public void testKt4420() throws Exception {
                 runTest("compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt");
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
index 12212c1991b..74c425eab43 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
@@ -32,6 +32,7 @@ import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluat
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils
 import org.jetbrains.kotlin.utils.addToStdlib.cast
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
@@ -391,6 +392,9 @@ class DiagnosticReporterByTrackingStrategy(
                     }
                 ) return
 
+                if (isSpecialFunction(error.resolvedAtom))
+                    return
+
                 val expression = when (val atom = error.resolvedAtom.atom) {
                     is PSIKotlinCall -> atom.psiCall.calleeExpression
                     is PSIKotlinCallArgument -> atom.valueArgument.getArgumentExpression()
@@ -407,6 +411,14 @@ class DiagnosticReporterByTrackingStrategy(
         }
     }
 
+    private fun isSpecialFunction(atom: ResolvedAtom): Boolean {
+        if (atom !is ResolvedCallAtom) return false
+
+        return ControlStructureTypingUtils.ResolveConstruct.values().any { specialFunction ->
+            specialFunction.specialFunctionName == atom.candidateDescriptor.name
+        }
+    }
+
     private fun reportConstantTypeMismatch(constraintError: NewConstraintError, expression: KtExpression): Boolean {
         if (expression is KtConstantExpression) {
             val module = context.scope.ownerDescriptor.module
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
index c2d9240da61..7f21b25d13d 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
@@ -1,7 +1,7 @@
 // !WITH_NEW_INFERENCE
 
 fun test1() {
-    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>if (<!UNRESOLVED_REFERENCE!>rr<!>) {
+    if (<!UNRESOLVED_REFERENCE!>rr<!>) {
         if (<!UNRESOLVED_REFERENCE!>l<!>) {
             <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>q<!>()
         }
@@ -16,7 +16,7 @@ fun test1() {
         else {
             <!UNRESOLVED_REFERENCE!>a<!>.<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>u<!>()
         }
-    }<!>
+    }
 }
 
 fun test2(l: List<<!UNRESOLVED_REFERENCE!>AA<!>>) {
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
new file mode 100644
index 00000000000..0c05a63971e
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
@@ -0,0 +1,25 @@
+// !WITH_NEW_INFERENCE
+
+import java.lang.Exception
+
+fun <K> id(arg: K): K = arg
+
+fun test() {
+    <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)!!
+    <!UNRESOLVED_REFERENCE!>unresolved<!>!!!!
+    try {
+        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    } catch (e: Exception) {
+        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    }
+
+    if (true)
+        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    else
+        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+
+    when {
+        true -> <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    }
+    <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>) ?: <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
new file mode 100644
index 00000000000..a47c7211b08
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
@@ -0,0 +1,25 @@
+// !WITH_NEW_INFERENCE
+
+import java.lang.Exception
+
+fun <K> id(arg: K): K = arg
+
+fun test() {
+    id(<!UNRESOLVED_REFERENCE!>unresolved<!>)<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
+    <!UNRESOLVED_REFERENCE!>unresolved<!>!!<!NI;UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
+    try {
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    } catch (e: Exception) {
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    }
+
+    if (true)
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    else
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+
+    when {
+        true -> id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    }
+    id(<!UNRESOLVED_REFERENCE!>unresolved<!>) ?: id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.txt
new file mode 100644
index 00000000000..805e26c2432
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.txt
@@ -0,0 +1,4 @@
+package
+
+public fun </*0*/ K> id(/*0*/ arg: K): K
+public fun test(): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt
new file mode 100644
index 00000000000..5e8254c4013
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt
@@ -0,0 +1,14 @@
+// !WITH_NEW_INFERENCE
+
+fun <K> id(arg: K): K = arg
+fun <M> materialize(): M = TODO()
+
+fun test(b: Boolean) {
+    <!INAPPLICABLE_CANDIDATE!>id<!>(if (b) {
+        <!INAPPLICABLE_CANDIDATE!>id<!>(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    } else {
+        id(
+            materialize()
+        )
+    })
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
new file mode 100644
index 00000000000..d2625902a26
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
@@ -0,0 +1,14 @@
+// !WITH_NEW_INFERENCE
+
+fun <K> id(arg: K): K = arg
+fun <M> materialize(): M = TODO()
+
+fun test(b: Boolean) {
+    <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(if (b) {
+        id(<!UNRESOLVED_REFERENCE!>unresolved<!>)
+    } else {
+        <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>id<!>(
+            <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>materialize<!>()
+        )
+    })
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.txt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.txt
new file mode 100644
index 00000000000..e1d8ed4db69
--- /dev/null
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.txt
@@ -0,0 +1,5 @@
+package
+
+public fun </*0*/ K> id(/*0*/ arg: K): K
+public fun </*0*/ M> materialize(): M
+public fun test(/*0*/ b: kotlin.Boolean): kotlin.Unit
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
index 42480796d15..88507dd8e6e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
@@ -12,7 +12,7 @@ fun <T> emptyList() : List<T>? = ArrayList<T>()
 fun foo() {
     // type arguments shouldn't be required
     val <!UNUSED_VARIABLE!>l<!> : List<Int> = emptyList()!!
-    val <!UNUSED_VARIABLE!>l1<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()<!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>!!<!>
+    val <!UNUSED_VARIABLE!>l1<!> = <!NI;NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, OI;TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>emptyList<!>()!!
 
     checkSubtype<List<Int>>(emptyList()!!)
     checkSubtype<List<Int>?>(emptyList())
diff --git a/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt b/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt
index 1c3e3498679..6152c6d22c4 100644
--- a/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt
+++ b/compiler/testData/diagnostics/tests/resolve/callableReferenceInCST.kt
@@ -28,7 +28,7 @@ fun testElvis(x: Any?) {
 }
 
 fun testExclExcl() {
-    val y = :: <!UNRESOLVED_REFERENCE!>unresolved<!><!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER, NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
+    val y = :: <!UNRESOLVED_REFERENCE!>unresolved<!><!NOT_NULL_ASSERTION_ON_CALLABLE_REFERENCE!>!!<!>
 }
 
 fun testTry() {
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
index 1dd1b7eb251..f4e9f61dddf 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
@@ -11317,6 +11317,16 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/inference/regressions/kt35943.kt");
                 }
 
+                @TestMetadata("kt36342.kt")
+                public void testKt36342() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt");
+                }
+
+                @TestMetadata("kt36342_2.kt")
+                public void testKt36342_2() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt");
+                }
+
                 @TestMetadata("kt4420.kt")
                 public void testKt4420() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt");
diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
index e1dd1da2081..9edec4e8c6f 100644
--- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java
@@ -11312,6 +11312,16 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/inference/regressions/kt35943.kt");
                 }
 
+                @TestMetadata("kt36342.kt")
+                public void testKt36342() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt");
+                }
+
+                @TestMetadata("kt36342_2.kt")
+                public void testKt36342_2() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt");
+                }
+
                 @TestMetadata("kt4420.kt")
                 public void testKt4420() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/inference/regressions/kt4420.kt");