diff --git a/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java b/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
index 146cde126eb3..09fb09cb93ba 100644
--- a/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/sameParameterValue/SameParameterValueInspection.java
@@ -42,6 +42,7 @@ import com.intellij.util.ui.JBUI;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.uast.UExpression;
+import org.jetbrains.uast.UParameter;
 import org.jetbrains.uast.UastContextKt;
 
 import javax.swing.*;
@@ -118,7 +119,9 @@ public class SameParameterValueInspection extends GlobalJavaBatchInspectionTool
           if (minimalUsageCount != 0 && refParameter.getUsageCount() < minimalUsageCount) continue;
           if (!globalContext.shouldCheck(refParameter, this)) continue;
           if (problems == null) problems = new ArrayList<>(1);
-          problems.add(registerProblem(manager, refParameter.getElement(), value, refParameter.isUsedForWriting()));
+          UParameter parameter = refParameter.getUastElement();
+          if (parameter == null) continue;
+          problems.add(registerProblem(manager, (PsiParameter)parameter.getJavaPsi(), value, refParameter.isUsedForWriting()));
         }
       }
     }
diff --git a/java/java-tests/testData/inspection/jvm/sameParameterValue/methodWithSuper/expected.xml b/java/java-tests/testData/inspection/jvm/sameParameterValue/methodWithSuper/expected.xml
index 989f486864a8..625c4a8ef542 100644
--- a/java/java-tests/testData/inspection/jvm/sameParameterValue/methodWithSuper/expected.xml
+++ b/java/java-tests/testData/inspection/jvm/sameParameterValue/methodWithSuper/expected.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <problems>
-  <problem>
-    <file>Test.kt</file>
-    <line>9</line>
-    <problem_class>Actual method parameter is the same constant</problem_class>
-    <description>Actual value of parameter 'i' is always '10'</description>
-  </problem>
-
   <problem>
     <file>Test.kt</file>
     <line>2</line>
diff --git a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/SameParameterValueInspectionJvmTest.java b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/SameParameterValueInspectionJvmTest.java
index ca6b8ce00e07..23a19d207c8a 100644
--- a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/SameParameterValueInspectionJvmTest.java
+++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/SameParameterValueInspectionJvmTest.java
@@ -30,7 +30,7 @@ public class SameParameterValueInspectionJvmTest extends InspectionTestCase {
   }
 
   public void testEntryPoint() {
-    doTest(getGlobalTestDir(), myGlobalTool);
+    doTest(getGlobalTestDir(), myGlobalTool, false, true);
   }
 
   public void testMethodWithSuper() {