diff --git a/src/lib/components/UnsuccessfulResult.component.tsx b/src/lib/components/UnsuccessfulResult.component.tsx
index f9d734088d..1b048cc7b5 100644
--- a/src/lib/components/UnsuccessfulResult.component.tsx
+++ b/src/lib/components/UnsuccessfulResult.component.tsx
@@ -11,7 +11,7 @@ import { Text } from './text/Text.component';
import { Box } from './box/Box';
import { spacing } from '../spacing';
-const NoResult = styled(Box)<{ height: number | string }>`
+export const NoResult = styled(Box)<{ height: number | string }>`
display: flex;
justify-content: center;
align-items: center;
diff --git a/src/lib/components/tablev2/TableCommon.tsx b/src/lib/components/tablev2/TableCommon.tsx
index 0888ca0b6a..57245d938e 100644
--- a/src/lib/components/tablev2/TableCommon.tsx
+++ b/src/lib/components/tablev2/TableCommon.tsx
@@ -147,21 +147,30 @@ export function TableRows<
/>
);
}
-
if (status === 'success' || status === undefined) {
if (typeof children === 'function') {
- return children(
- ,
- );
+ if (rows.length) {
+ return children(
+ ,
+ );
+ } else {
+ return children(
+ ,
+ );
+ }
} else if (rows.length) {
return (
);
} else {
- return ;
+ return (
+
+ );
}
}