diff --git a/src/components/results/loadflow/load-flow-result-tab.tsx b/src/components/results/loadflow/load-flow-result-tab.tsx
index e35c9951e4..0896735a47 100644
--- a/src/components/results/loadflow/load-flow-result-tab.tsx
+++ b/src/components/results/loadflow/load-flow-result-tab.tsx
@@ -241,7 +241,7 @@ export const LoadFlowResultTab: FunctionComponent<LoadFlowTabProps> = ({
 
     const result = useMemo(() => {
         if (!loadflowResult) {
-            return [];
+            return undefined;
         }
         if (tabIndex === 0 || tabIndex === 1) {
             return makeData(loadflowResult, intl);
diff --git a/src/components/results/securityanalysis/security-analysis-result-n.tsx b/src/components/results/securityanalysis/security-analysis-result-n.tsx
index 67b3ebcc81..32e115b51f 100644
--- a/src/components/results/securityanalysis/security-analysis-result-n.tsx
+++ b/src/components/results/securityanalysis/security-analysis-result-n.tsx
@@ -26,8 +26,9 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
     const intl: IntlShape = useIntl();
 
     const rows = useMemo(() => {
-        return result?.length // check if it's not Page object
-            ? (result?.map((preContingencyResult: PreContingencyResult) => {
+        return !result
+            ? undefined
+            : (result?.map((preContingencyResult: PreContingencyResult) => {
                   const { limitViolation, subjectId } = preContingencyResult;
                   return {
                       subjectId: subjectId,
@@ -51,8 +52,7 @@ export const SecurityAnalysisResultN: FunctionComponent<SecurityAnalysisResultNP
                               ? null
                               : limitViolation?.upcomingAcceptableDuration,
                   } as SecurityAnalysisNTableRow;
-              }) ?? [])
-            : [];
+              }) ?? []);
     }, [intl, result]);
 
     return (
diff --git a/src/components/results/securityanalysis/security-analysis.type.ts b/src/components/results/securityanalysis/security-analysis.type.ts
index 3b1ab13261..d514ac53bf 100644
--- a/src/components/results/securityanalysis/security-analysis.type.ts
+++ b/src/components/results/securityanalysis/security-analysis.type.ts
@@ -145,7 +145,7 @@ export interface SecurityAnalysisNTableRow {
 }
 
 export interface SecurityAnalysisResultProps {
-    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[];
+    rows: SecurityAnalysisNTableRow[] | SecurityAnalysisNmkTableRow[] | undefined;
     columnDefs: ColDef[];
     isLoadingResult: boolean;
     agGridProps?: AgGridReactProps;
diff --git a/src/components/utils/aggrid-rows-handler.ts b/src/components/utils/aggrid-rows-handler.ts
index 86d73c291b..8ad09172a8 100644
--- a/src/components/utils/aggrid-rows-handler.ts
+++ b/src/components/utils/aggrid-rows-handler.ts
@@ -32,9 +32,9 @@ export function getNoRowsMessage(
         case RunningStatus.FAILED:
             return messages.failed;
         case RunningStatus.SUCCEED:
-            if (!isDataReady) {
+            if (!isDataReady || !rows) {
                 return messages.fetching;
-            } else if (!rows || rows?.length === 0) {
+            } else if (rows && rows.length === 0) {
                 return messages.noData ? messages.noData : messages.noLimitViolation;
             }
             return undefined;