diff --git a/src/Services/Search/RepositorySearchService.php b/src/Services/Search/RepositorySearchService.php index 2cbe01054..77eff1116 100644 --- a/src/Services/Search/RepositorySearchService.php +++ b/src/Services/Search/RepositorySearchService.php @@ -32,7 +32,9 @@ public function search(RestifyRequest $request, Repository $repository): Builder $query = $this->prepareMatchFields( $request, - $this->prepareSearchFields( + $repository::usesScout() + ? $this->prepareRelations($request, $scoutQuery ?? $repository::query($request)) + : $this->prepareSearchFields( $request, $this->prepareRelations($request, $scoutQuery ?? $repository::query($request)), ),