diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt
index 1ae9e3d99b2..7531eff7b03 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.kt
@@ -38,7 +38,10 @@ class ChangeToStarProjectionFix(element: KtTypeElement) : KotlinQuickFixAction<K
             val typeReference = diagnostic.psiElement.getNonStrictParentOfType<KtBinaryExpressionWithTypeRHS>()?.right
                                 ?: diagnostic.psiElement.getNonStrictParentOfType<KtTypeReference>()
             val typeElement = typeReference?.typeElement ?: return null
-            return ChangeToStarProjectionFix(typeElement)
+            if (typeElement.typeArgumentsAsTypes.isNotEmpty()) {
+                return ChangeToStarProjectionFix(typeElement)
+            }
+            return null
         }
     }
 }
diff --git a/idea/testData/quickfix/addStarProjections/cast/uncheckedCastOnTypeParameter.kt b/idea/testData/quickfix/addStarProjections/cast/uncheckedCastOnTypeParameter.kt
new file mode 100644
index 00000000000..9b897c34b44
--- /dev/null
+++ b/idea/testData/quickfix/addStarProjections/cast/uncheckedCastOnTypeParameter.kt
@@ -0,0 +1,5 @@
+// "Change type arguments to <>" "false"
+// ACTION: Convert to expression body
+fun <T> get(column: String, map: Map<String, Any>): T {
+    return map[column] as <caret>T
+}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
index 6474ca97e74..5e2d73b549c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java
@@ -413,6 +413,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest {
                 String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/changeToStarProjectionNullable.kt");
                 doTest(fileName);
             }
+
+            @TestMetadata("uncheckedCastOnTypeParameter.kt")
+            public void testUncheckedCastOnTypeParameter() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/addStarProjections/cast/uncheckedCastOnTypeParameter.kt");
+                doTest(fileName);
+            }
         }
 
         @TestMetadata("idea/testData/quickfix/addStarProjections/checkType")