diff --git a/java/java-impl/src/com/intellij/codeInspection/streamMigration/JoiningMigration.java b/java/java-impl/src/com/intellij/codeInspection/streamMigration/JoiningMigration.java
index df12f8948624..85ef57484823 100644
--- a/java/java-impl/src/com/intellij/codeInspection/streamMigration/JoiningMigration.java
+++ b/java/java-impl/src/com/intellij/codeInspection/streamMigration/JoiningMigration.java
@@ -233,7 +233,7 @@ public class JoiningMigration extends BaseStreamApiMigration {
         if (element.isValid() && element instanceof PsiExpression) {
           PsiMethodCallExpression call = ExpressionUtils.getCallForQualifier((PsiExpression)element);
           if (call != null && "toString".equals(call.getMethodExpression().getReferenceName())) {
-            call.replace(element);
+            new CommentTracker().replaceAndRestoreComments(call, element);
           }
         }
       }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/afterJoining.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/afterJoining.java
index 8375284feeca..9791168ecba2 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/afterJoining.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/afterJoining.java
@@ -8,6 +8,7 @@ public class Test {
     String sb;
     System.out.println("hello");
       sb = list.stream().filter(s -> !s.isEmpty()).map(String::trim).collect(Collectors.joining());
-    return sb.length() == 0 ? null : sb;
+      //comment
+      return sb.length() == 0 ? null : sb;
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/beforeJoining.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/beforeJoining.java
index d38c32869954..0307e834e3ab 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/beforeJoining.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/streamApiMigration/joining/beforeJoining.java
@@ -11,6 +11,7 @@ public class Test {
         sb.append(s.trim());
       }
     }
-    return sb.length() == 0 ? null : sb.toString();
+    return sb.length() == 0 ? null : sb.toString//comment
+      ();
   }
 }
\ No newline at end of file