diff --git a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/VariableAccessUtils.java b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/VariableAccessUtils.java
index 7d8c444677c6..2ef95f3d013e 100644
--- a/java/java-analysis-impl/src/com/siyeh/ig/psiutils/VariableAccessUtils.java
+++ b/java/java-analysis-impl/src/com/siyeh/ig/psiutils/VariableAccessUtils.java
@@ -637,6 +637,7 @@ public final class VariableAccessUtils {
   /// It's possible there are cases not covered by this method.
   /// If you discover such a case, consider updating the implementation.
   public static boolean isVariableTypeChangeSafeForReference(@NotNull PsiType targetType, @NotNull PsiReferenceExpression reference) {
+    if (targetType instanceof PsiLambdaParameterType || PsiTypes.nullType().equals(targetType)) return false;
     PsiElement parent = PsiUtil.skipParenthesizedExprUp(reference.getParent());
     if (PsiUtil.isAccessedForWriting(reference)) {
       if (!(parent instanceof PsiAssignmentExpression assignment)) return false;
@@ -664,7 +665,6 @@ public final class VariableAccessUtils {
     }
     // Some method call can be mis-resolved after update, check this
     if (parent instanceof PsiExpressionList && parent.getParent() instanceof PsiCallExpression call) {
-      if (PsiTypes.nullType().equals(targetType)) return false;
       PsiMethod method = call.resolveMethod();
       if (method == null) return false;
       Object mark = new Object();
@@ -679,8 +679,8 @@ public final class VariableAccessUtils {
       Objects.requireNonNull(insertedCast.getCastType()).replace(factory.createTypeElement(targetType));
       return callCopy.resolveMethod() == method;
     }
-    if (parent instanceof PsiReferenceExpression) {
-      final PsiElement resolve = ((PsiReferenceExpression)parent).resolve();
+    if (parent instanceof PsiReferenceExpression ref) {
+      final PsiElement resolve = ref.resolve();
       // private member cannot be accessed on a subtype qualifier
       if (resolve instanceof PsiMember member && member.hasModifierProperty(PsiModifier.PRIVATE)) {
         return false;
diff --git a/java/java-tests/testData/ig/com/siyeh/igtest/dataflow/unnecessary_local_variable/UnnecessaryLocalVariable.java b/java/java-tests/testData/ig/com/siyeh/igtest/dataflow/unnecessary_local_variable/UnnecessaryLocalVariable.java
index 449b9274159e..e6a8977d618e 100644
--- a/java/java-tests/testData/ig/com/siyeh/igtest/dataflow/unnecessary_local_variable/UnnecessaryLocalVariable.java
+++ b/java/java-tests/testData/ig/com/siyeh/igtest/dataflow/unnecessary_local_variable/UnnecessaryLocalVariable.java
@@ -232,4 +232,15 @@ abstract class RedundantLocalInFor {
   }
 
   protected abstract RedundantLocalInFor getParent();
+
+  void incompleteLambda() {
+    <error descr="Cannot infer type: lambda expression requires an explicit target type">var</error> z = s -> {
+      final Object s1  = s;
+      return x(s1) ;
+    };
+  }
+
+  boolean x(Object o) {
+    return false;
+  }
 }