7 files changed, 7 insertions, 7 deletions
diff --git a/src/utils/hooks/use-article/use-article.ts b/src/utils/hooks/use-article/use-article.ts
index fbbc6bd..d5234cb 100644
--- a/src/utils/hooks/use-article/use-article.ts
+++ b/src/utils/hooks/use-article/use-article.ts
@@ -22,7 +22,7 @@ export const useArticle = <T extends Maybe<WPPost>>(
   return {
     article: data ? convertPostToArticle(data) : undefined,
     isError: !!error,
-    isLoading,
+    isLoading: isLoading && !data,
     isValidating,
   } as UseArticleReturn<T>;
 };
diff --git a/src/utils/hooks/use-articles-list/use-articles-list.ts b/src/utils/hooks/use-articles-list/use-articles-list.ts
index 8a52702..c81d21d 100644
--- a/src/utils/hooks/use-articles-list/use-articles-list.ts
+++ b/src/utils/hooks/use-articles-list/use-articles-list.ts
@@ -76,7 +76,7 @@ export const useArticlesList = (
     hasNextPage,
     isEmpty,
     isError,
-    isLoading,
+    isLoading: isLoading && !articles,
     isLoadingMore,
     isRefreshing,
     isValidating,
diff --git a/src/utils/hooks/use-comments/use-comments.ts b/src/utils/hooks/use-comments/use-comments.ts
index cb967a5..7c8f11e 100644
--- a/src/utils/hooks/use-comments/use-comments.ts
+++ b/src/utils/hooks/use-comments/use-comments.ts
@@ -36,7 +36,7 @@ export const useComments = <T extends Maybe<WPComment[]>>({
       ? buildCommentsTree(data.map(convertWPCommentToComment))
       : undefined,
     isError: !!error,
-    isLoading,
+    isLoading: isLoading && !data,
     isValidating,
   } as UseCommentsReturn<T>;
 };
diff --git a/src/utils/hooks/use-thematic/use-thematic.ts b/src/utils/hooks/use-thematic/use-thematic.ts
index 68127d2..571cc73 100644
--- a/src/utils/hooks/use-thematic/use-thematic.ts
+++ b/src/utils/hooks/use-thematic/use-thematic.ts
@@ -24,7 +24,7 @@ export const useThematic = <T extends Maybe<WPThematic>>(
 
   return {
     isError: !!error,
-    isLoading,
+    isLoading: isLoading && !data,
     isValidating,
     thematic: data ? convertWPThematicToThematic(data) : undefined,
   } as UseThematicReturn<T>;
diff --git a/src/utils/hooks/use-thematics-list/use-thematics-list.ts b/src/utils/hooks/use-thematics-list/use-thematics-list.ts
index f63815a..aafc3ad 100644
--- a/src/utils/hooks/use-thematics-list/use-thematics-list.ts
+++ b/src/utils/hooks/use-thematics-list/use-thematics-list.ts
@@ -43,7 +43,7 @@ export const useThematicsList = <
 
   return {
     isError: !!error,
-    isLoading,
+    isLoading: isLoading && !data,
     isValidating,
     thematics: data,
   } as UseThematicsListReturn<T>;
diff --git a/src/utils/hooks/use-topic/use-topic.ts b/src/utils/hooks/use-topic/use-topic.ts
index bd7ee49..87cc55f 100644
--- a/src/utils/hooks/use-topic/use-topic.ts
+++ b/src/utils/hooks/use-topic/use-topic.ts
@@ -21,7 +21,7 @@ export const useTopic = <T extends Maybe<WPTopic>>(
 
   return {
     isError: !!error,
-    isLoading,
+    isLoading: isLoading && !data,
     isValidating,
     topic: data ? convertWPTopicToTopic(data) : undefined,
   } as UseTopicReturn<T>;
diff --git a/src/utils/hooks/use-topics-list/use-topics-list.ts b/src/utils/hooks/use-topics-list/use-topics-list.ts
index 7860486..20f760b 100644
--- a/src/utils/hooks/use-topics-list/use-topics-list.ts
+++ b/src/utils/hooks/use-topics-list/use-topics-list.ts
@@ -39,7 +39,7 @@ export const useTopicsList = <
 
   return {
     isError: !!error,
-    isLoading,
+    isLoading: isLoading && !data,
     isValidating,
     topics: data,
   } as UseTopicsListReturn<T>;