diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
index cc89a87ede38..a5e6dbdd6997 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
@@ -136,8 +136,9 @@ public final class PsiTypesUtil {
               return typeText + ".empty()";
             case CommonClassNames.JAVA_LANG_STRING:
               return "\"\"";
-            case CommonClassNames.JAVA_LANG_INTEGER:
             case CommonClassNames.JAVA_LANG_LONG:
+              return "0L";
+            case CommonClassNames.JAVA_LANG_INTEGER:
             case CommonClassNames.JAVA_LANG_SHORT:
             case CommonClassNames.JAVA_LANG_BYTE:
               return "0";
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java
index 002153597eeb..638491b82fcc 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/OverrideImplementTest.java
@@ -260,6 +260,38 @@ public class OverrideImplementTest extends LightJavaCodeInsightFixtureTestCase {
         """);
   }
 
+  public void testOverrideLong() {
+    myFixture.addClass(
+      """
+        package bar;
+        interface A {
+            Long foo();
+        }
+        """);
+    VirtualFile file = myFixture.addClass(
+      """                                            
+        package bar;
+        class Test implements A {
+            <caret>
+        }
+        """
+    ).getContainingFile().getVirtualFile();
+    myFixture.configureFromExistingVirtualFile(file);
+
+    invokeAction(true);
+
+    myFixture.checkResult(
+      """
+        package bar;
+        class Test implements A {
+            @Override
+            public Long foo() {
+                return 0L;
+            }
+        }
+        """);
+  }
+
   public void testTypeAnnotationsInImplementedMethod() {
     OverrideImplementsAnnotationsHandler handler = new OverrideImplementsAnnotationsHandler() {
       @Override