diff --git a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/expressionTypeProvider/Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/expressionTypeProvider/Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
index 61c95ae2ad2..d57c4b3fb79 100644
--- a/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/expressionTypeProvider/Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
+++ b/analysis/analysis-api-fe10/tests-gen/org/jetbrains/kotlin/analysis/api/fe10/test/cases/generated/cases/components/expressionTypeProvider/Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
@@ -340,6 +340,12 @@ public class Fe10IdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerate
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.kt");
     }
 
+    @Test
+    @TestMetadata("safeCallArgument.kt")
+    public void testSafeCallArgument() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt");
+    }
+
     @Test
     @TestMetadata("sam.kt")
     public void testSam() throws Exception {
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
index 29205676e2f..90b98163a85 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
@@ -340,6 +340,12 @@ public class FirIdeDependentAnalysisSourceModuleExpectedExpressionTypeTestGenera
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.kt");
     }
 
+    @Test
+    @TestMetadata("safeCallArgument.kt")
+    public void testSafeCallArgument() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt");
+    }
+
     @Test
     @TestMetadata("sam.kt")
     public void testSam() throws Exception {
diff --git a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
index 639ee378f6d..f58bdad04e8 100644
--- a/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
+++ b/analysis/analysis-api-fir/tests-gen/org/jetbrains/kotlin/analysis/api/fir/test/cases/generated/cases/components/expressionTypeProvider/FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
@@ -340,6 +340,12 @@ public class FirIdeNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.kt");
     }
 
+    @Test
+    @TestMetadata("safeCallArgument.kt")
+    public void testSafeCallArgument() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt");
+    }
+
     @Test
     @TestMetadata("sam.kt")
     public void testSam() throws Exception {
diff --git a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/expressionTypeProvider/FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/expressionTypeProvider/FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
index 17f454ff080..2e46d704cd4 100644
--- a/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/expressionTypeProvider/FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
+++ b/analysis/analysis-api-standalone/tests-gen/org/jetbrains/kotlin/analysis/api/standalone/fir/test/cases/generated/cases/components/expressionTypeProvider/FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGenerated.java
@@ -340,6 +340,12 @@ public class FirStandaloneNormalAnalysisSourceModuleExpectedExpressionTypeTestGe
         runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/returnFromLambda.kt");
     }
 
+    @Test
+    @TestMetadata("safeCallArgument.kt")
+    public void testSafeCallArgument() throws Exception {
+        runTest("analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt");
+    }
+
     @Test
     @TestMetadata("sam.kt")
     public void testSam() throws Exception {
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.descriptors.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.descriptors.txt
new file mode 100644
index 00000000000..592f269ee76
--- /dev/null
+++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.descriptors.txt
@@ -0,0 +1,5 @@
+expression: arg
+expected type: KtUsualClassType:
+  annotationsList: []
+  ownTypeArguments: []
+  type: kotlin/String
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt
new file mode 100644
index 00000000000..093f6223c03
--- /dev/null
+++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.kt
@@ -0,0 +1,8 @@
+class Foo {
+    fun bar(y: String) {}
+}
+
+fun x(foo: Foo?) {
+    foo?.bar(<caret>arg)
+}
+
diff --git a/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.txt b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.txt
new file mode 100644
index 00000000000..e773c6c5030
--- /dev/null
+++ b/analysis/analysis-api/testData/components/expressionTypeProvider/expectedExpressionType/safeCallArgument.txt
@@ -0,0 +1,2 @@
+expression: arg
+expected type: null