diff --git a/npm/ng-packs/packages/core/src/lib/services/list.service.ts b/npm/ng-packs/packages/core/src/lib/services/list.service.ts index 7cafde0f35..e6de814b77 100644 --- a/npm/ng-packs/packages/core/src/lib/services/list.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/list.service.ts @@ -106,9 +106,8 @@ export class ListService implements hookToQuery( streamCreatorCallback: QueryStreamCreatorCallback, ): Observable> { - this._isLoading$.next(true); - return this.query$.pipe( + tap(() => this._isLoading$.next(true)), switchMap(query => streamCreatorCallback(query).pipe(catchError(() => of(null)))), filter(Boolean), tap(() => this._isLoading$.next(false)),