diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaOptionalConversionRule.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaOptionalConversionRule.java
index 12e80cfc2995..e6ccc20cf915 100644
--- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaOptionalConversionRule.java
+++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaOptionalConversionRule.java
@@ -157,7 +157,7 @@ public class GuavaOptionalConversionRule extends BaseGuavaTypeConversionRule {
     descriptorsMap.put("isPresent", identity);
     descriptorsMap.put("orNull", new TypeConversionDescriptor("$val$.orNull()", "$val$.orElse(null)"));
     descriptorsMap.put("asSet", new TypeConversionDescriptor("$val$.asSet()",
-                                                             "$val$.isPresent() ? java.util.Collections.singleton($val$.get()) : java.util.Collections.emptySet()"));
+                                                             "$val$.map(java.util.Collections::singleton).orElse(java.util.Collections.emptySet())"));
   }
 
   @NotNull
diff --git a/java/typeMigration/testData/inspections/guava/optional_after.java b/java/typeMigration/testData/inspections/guava/optional_after.java
index e957e38b1690..87621f5d03e5 100644
--- a/java/typeMigration/testData/inspections/guava/optional_after.java
+++ b/java/typeMigration/testData/inspections/guava/optional_after.java
@@ -13,7 +13,7 @@ class A {
       System.out.println(o.get());
     }
     System.out.println(o.orElse(null));
-    Set<String> set = o.isPresent() ? Collections.singleton(o.get()) : Collections.emptySet();
+    Set<String> set = o.map(Collections::singleton).orElse(Collections.emptySet());
   }
 
 }
\ No newline at end of file