diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
index 82e55edf4b4..27eb1b516dc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
@@ -128,6 +128,7 @@ class RemoveExplicitTypeArgumentsIntention : SelfTargetingOffsetIndependentInten
                 if (element !is KtExpression) continue
 
                 if (element.getQualifiedExpressionForSelector() != null) continue
+                if (element is KtFunctionLiteral) continue
                 if (!element.isUsedAsExpression(bindingContext)) return element to null
 
                 val parent = element.parent
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/expected.xml b/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/expected.xml
index fd195dbbb0e..069d6819617 100644
--- a/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/expected.xml
+++ b/idea/testData/intentions/removeExplicitTypeArguments/inspectionData/expected.xml
@@ -214,4 +214,13 @@
     <problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unnecessary type argument</problem_class>
     <description>Remove explicit type arguments</description>
   </problem>
+
+  <problem>
+    <file>lambdaValue.kt</file>
+    <line>5</line>
+    <module>light_idea_test_case</module>
+    <entry_point TYPE="file" FQNAME="lambdaValue.kt" />
+    <problem_class severity="WARNING" attribute_key="NOT_USED_ELEMENT_ATTRIBUTES">Unnecessary type argument</problem_class>
+    <description>Remove explicit type arguments</description>
+  </problem>
 </problems>
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt b/idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt
new file mode 100644
index 00000000000..cc4f8b05322
--- /dev/null
+++ b/idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: true
+// WITH_RUNTIME
+
+fun foo(): List<String> = run {
+    listOf<caret><String>()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt.after b/idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt.after
new file mode 100644
index 00000000000..5ba4290e9ad
--- /dev/null
+++ b/idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt.after
@@ -0,0 +1,6 @@
+// IS_APPLICABLE: true
+// WITH_RUNTIME
+
+fun foo(): List<String> = run {
+    listOf()
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index cbc1a04759e..d81554b0759 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -12956,6 +12956,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             doTest(fileName);
         }
 
+        @TestMetadata("lambdaValue.kt")
+        public void testLambdaValue() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/lambdaValue.kt");
+            doTest(fileName);
+        }
+
         @TestMetadata("literalAny.kt")
         public void testLiteralAny() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/literalAny.kt");
diff --git a/j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.kt b/j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.kt
index e9b281967ef..c92369fb13f 100644
--- a/j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.kt
+++ b/j2k/testData/fileOrElement/arrayType/arrayInitializationStatementWithDimension3d.kt
@@ -1 +1 @@
-val d3 = Array<Array<IntArray>>(5) { arrayOfNulls<IntArray>(5) }
\ No newline at end of file
+val d3 = Array<Array<IntArray>>(5) { arrayOfNulls(5) }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.kt b/j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.kt
index 8180c6e2c7e..0db72939b6b 100644
--- a/j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.kt
+++ b/j2k/testData/fileOrElement/arrayType/d2StringEmptyArray.kt
@@ -1 +1 @@
-val ss = Array<Array<String>>(5) { arrayOfNulls<String>(5) }
\ No newline at end of file
+val ss = Array<Array<String>>(5) { arrayOfNulls(5) }
\ No newline at end of file
diff --git a/j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.kt b/j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.kt
index e2fe7c4cc84..14d4dd69cf5 100644
--- a/j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.kt
+++ b/j2k/testData/fileOrElement/arrayType/d3StringEmptyArray.kt
@@ -1 +1 @@
-val sss = Array(5) { Array<Array<String>>(5) { arrayOfNulls<String>(5) } }
\ No newline at end of file
+val sss = Array(5) { Array<Array<String>>(5) { arrayOfNulls(5) } }
\ No newline at end of file