diff --git a/src/fireedge/src/client/components/Tables/Enhanced/index.js b/src/fireedge/src/client/components/Tables/Enhanced/index.js
index b1eeb9874b..1dfc409846 100644
--- a/src/fireedge/src/client/components/Tables/Enhanced/index.js
+++ b/src/fireedge/src/client/components/Tables/Enhanced/index.js
@@ -208,7 +208,7 @@ const EnhancedTable = ({
 
       <div className={clsx(styles.body, classes.body)}>
         {/* NO DATA MESSAGE */}
-        {!isUninitialized && page?.length === 0 && (
+        {!isLoading && !isUninitialized && page?.length === 0 && (
           <span className={styles.noDataMessage}>
             <InfoEmpty />
             <Translate word={T.NoDataAvailable} />