diff --git a/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java b/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java
index 190d85a5ce71..60fe941d46c6 100644
--- a/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java
@@ -470,9 +470,12 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI
           !EquivalenceChecker.getCanonicalPsiEquivalence().typesAreEquivalent(qualifier.getType(), parentCall.getType())) {
         return null;
       }
-      if ("get".equals(call.getMethodExpression().getReferenceName())) {
+      String name = call.getMethodExpression().getReferenceName();
+      if ("get".equals(name)) {
         SpecialFieldValue fact = CommonDataflow.getExpressionFact(qualifier, DfaFactType.SPECIAL_FIELD_VALUE);
         if (DfaFactType.NULLABILITY.fromDfaValue(SpecialField.OPTIONAL_VALUE.extract(fact)) != DfaNullability.NOT_NULL) return null;
+      } else if ("orElse".equals(name)) {
+        if (!ExpressionUtils.isNullLiteral(call.getArgumentList().getExpressions()[0])) return null;
       }
       return new Context(qualifier, parentCall);
     }
@@ -490,7 +493,7 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI
       if (myType == Type.OptionalGet) {
         return OPTIONAL_GET;
       }
-      return OPTIONAL_OR_ELSE_OR_ELSE_GET;
+      return OPTIONAL_OR_ELSE;
     }
 
     private static class Context {
diff --git a/java/java-tests/testData/inspection/optionalChains/afterRewrapOrElseGet.java b/java/java-tests/testData/inspection/optionalChains/afterRewrapOrElseGet.java
deleted file mode 100644
index 7c9217cfd6a0..000000000000
--- a/java/java-tests/testData/inspection/optionalChains/afterRewrapOrElseGet.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// "Unwrap" "true"
-import java.util.*;
-
-public class Tests {
-  void test(List<String> list) {
-    Optional<String> opt = list.stream().filter(Objects::nonNull).findFirst();
-  }
-}
diff --git a/java/java-tests/testData/inspection/optionalChains/beforeRewrapNotNull.java b/java/java-tests/testData/inspection/optionalChains/beforeRewrapNotNull.java
new file mode 100644
index 000000000000..e100e3e59798
--- /dev/null
+++ b/java/java-tests/testData/inspection/optionalChains/beforeRewrapNotNull.java
@@ -0,0 +1,8 @@
+// "Unwrap" "false"
+import java.util.*;
+
+public class Tests {
+  private Optional<String> test(Optional<String> testOptional, String defaultVal) {
+    return Optional.ofNullable(testOptional.or<caret>Else(defaultVal));
+  }
+}
diff --git a/java/java-tests/testData/inspection/optionalChains/beforeRewrapOrElseGet.java b/java/java-tests/testData/inspection/optionalChains/beforeRewrapOrElseGet.java
index ade2df7bb1a4..4a2428cb9f6e 100644
--- a/java/java-tests/testData/inspection/optionalChains/beforeRewrapOrElseGet.java
+++ b/java/java-tests/testData/inspection/optionalChains/beforeRewrapOrElseGet.java
@@ -1,8 +1,10 @@
-// "Unwrap" "true"
+// "Unwrap" "false"
 import java.util.*;
 
 public class Tests {
   void test(List<String> list) {
+    // Will be reported as "Excessive lambda usage", changing to orElse which will trigger rewrapping inspection
+    // no need to do this in single step
     Optional<String> opt = Optional.ofNullable(list.stream().filter(Objects::nonNull).findFirst().<caret>orElseGet(() -> null));
   }
 }