Update packages/toolkit/src/query/react/buildHooks.ts

Co-authored-by: Lenz Weber-Tronic <[email protected]>

Author: smacpherson64

packages/toolkit/src/query/react/buildHooks.ts

@@ -696,7 +696,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
     // isFetching = true any time a request is in flight
     const isFetching = currentState.isLoading
     // isLoading = true only when loading while no data is present yet (initial load with no data in the cache)
-    const isLoading = !hasError && !hasData && isFetching
+    const isLoading = (!lastResult || lastResult.isLoading || lastResult.isUninitialized) && !hasData && isFetching
     // isSuccess = true when data is present
     const isSuccess = currentState.isSuccess || (isFetching && hasData)