diff --git a/src/QueryBuilder/ResultViewer/ResultViewer.js b/src/QueryBuilder/ResultViewer/ResultViewer.js
index 6e7bb318..3aec7615 100644
--- a/src/QueryBuilder/ResultViewer/ResultViewer.js
+++ b/src/QueryBuilder/ResultViewer/ResultViewer.js
@@ -124,7 +124,7 @@ export const ResultViewer = ({
   );
 
   const renderTable = () => {
-    const showSpinner = !lastNotEmptyContent && isListLoading && isEmpty(contentData);
+    const showSpinner = isEmpty(lastNotEmptyContent) && (isListLoading || isContentDataLoading) && isEmpty(contentData);
 
     return (
       <Row center="xs">