diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
index 1ec4c829e088..4033e4aa25c0 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
@@ -66,21 +66,23 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
     }
   }
 
-  private static boolean processInheritors(@NotNull final ClassInheritorsSearch.SearchParameters parameters,
-                                           @NotNull final Processor<PsiClass> consumer) {
+  private static void processInheritors(@NotNull final ClassInheritorsSearch.SearchParameters parameters,
+                                        @NotNull final Processor<PsiClass> consumer) {
     @NotNull final PsiClass baseClass = parameters.getClassToProcess();
-    if (baseClass instanceof PsiAnonymousClass || isFinal(baseClass)) return true;
+    if (baseClass instanceof PsiAnonymousClass || isFinal(baseClass)) return;
 
     final SearchScope searchScope = parameters.getScope();
     Project project = PsiUtilCore.getProjectInReadAction(baseClass);
     if (isJavaLangObject(baseClass)) {
-      return AllClassesSearch.search(searchScope, project, parameters.getNameCondition()).forEach(aClass -> {
+      AllClassesSearch.search(searchScope, project, parameters.getNameCondition()).forEach(aClass -> {
         ProgressManager.checkCanceled();
         return isJavaLangObject(aClass) || consumer.process(aClass);
       });
+      return;
     }
-    if (searchScope instanceof LocalSearchScope) {
-      return processLocalScope(project, parameters, (LocalSearchScope)searchScope, baseClass, consumer);
+    if (searchScope instanceof LocalSearchScope && JavaOverridingMethodsSearcher.isJavaOnlyScope(((LocalSearchScope)searchScope).getVirtualFiles())) {
+      processLocalScope(project, parameters, (LocalSearchScope)searchScope, baseClass, consumer);
+      return;
     }
 
     Iterable<PsiClass> cached = getOrComputeSubClasses(project, baseClass, searchScope);
@@ -92,10 +94,9 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
       }
       if (ReadAction.compute(() ->
         checkCandidate(subClass, parameters) && !consumer.process(subClass))) {
-        return false;
+        return;
       }
     }
-    return true;
   }
 
   @NotNull
@@ -129,11 +130,11 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
     return cached;
   }
 
-  private static boolean processLocalScope(@NotNull final Project project,
-                                           @NotNull final ClassInheritorsSearch.SearchParameters parameters,
-                                           @NotNull LocalSearchScope searchScope,
-                                           @NotNull PsiClass baseClass,
-                                           @NotNull Processor<PsiClass> consumer) {
+  private static void processLocalScope(@NotNull final Project project,
+                                        @NotNull final ClassInheritorsSearch.SearchParameters parameters,
+                                        @NotNull LocalSearchScope searchScope,
+                                        @NotNull PsiClass baseClass,
+                                        @NotNull Processor<PsiClass> consumer) {
     // optimisation: in case of local scope it's considered cheaper to enumerate all scope files and check if there is an inheritor there,
     // instead of traversing the (potentially huge) class hierarchy and filter out almost everything by scope.
     VirtualFile[] virtualFiles = searchScope.getVirtualFiles();
@@ -164,7 +165,6 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
         }
       });
     }
-    return success[0];
   }
 
   private static boolean checkCandidate(@NotNull PsiClass candidate, @NotNull ClassInheritorsSearch.SearchParameters parameters) {
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
index 04d9123f57d6..09eff7dbd55a 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaOverridingMethodsSearcher.java
@@ -81,7 +81,7 @@ public class JavaOverridingMethodsSearcher implements QueryExecutor<PsiMethod, O
     return true;
   }
 
-  private static boolean isJavaOnlyScope(@NotNull VirtualFile[] files) {
+  static boolean isJavaOnlyScope(@NotNull VirtualFile[] files) {
     return Arrays.stream(files).allMatch(file -> file.getFileType() == JavaFileType.INSTANCE);
   }
 
diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/FindOverridingMethodsAndClassesTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/FindOverridingMethodsAndClassesTest.groovy
index fd6ae5c6e4b7..01a8fde585c1 100644
--- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/FindOverridingMethodsAndClassesTest.groovy
+++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/overriding/FindOverridingMethodsAndClassesTest.groovy
@@ -15,8 +15,10 @@
  */
 
 package org.jetbrains.plugins.groovy.lang.overriding
+
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiMethod
+import com.intellij.psi.search.LocalSearchScope
 import com.intellij.psi.search.searches.ClassInheritorsSearch
 import com.intellij.psi.search.searches.FunctionalExpressionSearch
 import com.intellij.psi.search.searches.OverridingMethodsSearch
@@ -69,4 +71,12 @@ class FindOverridingMethodsAndClassesTest extends LightCodeInsightFixtureTestCas
     myFixture.addFileToProject("a.java", "class D {{  C.bar(() -> {}); }")
     assertSize(1, FunctionalExpressionSearch.search(myFixture.findClass("I")).findAll())
   }
+
+  void "test find groovy inheritor in local scope"() {
+    def superClass = myFixture.addClass("class Super {}");
+    def file = myFixture.addFileToProject("a.groovy", "class Foo extends Super {}")
+    
+    assert ClassInheritorsSearch.search(superClass).findAll().size() == 1
+    assert ClassInheritorsSearch.search(superClass, new LocalSearchScope(file), true).findAll().size() == 1
+  }
 }