diff --git a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx
index e39c0a16f71..b37ff1d55c7 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SampleDataTable.tsx
@@ -24,60 +24,66 @@ import { isEven } from '../../utils/CommonUtils';
 export type SampleColumns = { name: string; dataType: string };
 
 type Props = {
-  sampleData: {
-    columns: Array<SampleColumns>;
-    rows: TableData['rows'];
+  sampleData?: {
+    columns?: Array<SampleColumns>;
+    rows?: TableData['rows'];
   };
 };
 
 const SampleDataTable: FunctionComponent<Props> = ({ sampleData }: Props) => {
   return (
     <div className="tw-table-responsive">
-      <table
-        className="tw-min-w-max tw-w-full tw-table-auto"
-        data-testid="sample-data-table">
-        <thead>
-          <tr className="tableHead-row">
-            {sampleData.columns.map((column) => {
+      {sampleData?.rows && sampleData?.columns ? (
+        <table
+          className="tw-min-w-max tw-w-full tw-table-auto"
+          data-testid="sample-data-table">
+          <thead>
+            <tr className="tableHead-row">
+              {sampleData.columns.map((column) => {
+                return (
+                  <th
+                    className="tableHead-cell"
+                    data-testid="column-name"
+                    key={column.name}>
+                    {column.name}
+                    <span className="tw-py-0.5 tw-px-1 tw-ml-1 tw-rounded tw-text-grey-muted">
+                      ({lowerCase(column.dataType)})
+                    </span>
+                  </th>
+                );
+              })}
+            </tr>
+          </thead>
+          <tbody className="tw-text-gray-600 tw-text-sm">
+            {sampleData?.rows?.map((row, rowIndex) => {
               return (
-                <th
-                  className="tableHead-cell"
-                  data-testid="column-name"
-                  key={column.name}>
-                  {column.name}
-                  <span className="tw-py-0.5 tw-px-1 tw-ml-1 tw-rounded tw-text-grey-muted">
-                    ({lowerCase(column.dataType)})
-                  </span>
-                </th>
+                <tr
+                  className={classNames(
+                    'tableBody-row',
+                    !isEven(rowIndex + 1) ? 'odd-row' : null
+                  )}
+                  data-testid="row"
+                  key={rowIndex}>
+                  {row.map((data, index) => {
+                    return (
+                      <td
+                        className="tableBody-cell"
+                        data-testid="cell"
+                        key={index}>
+                        {data ? data.toString() : '--'}
+                      </td>
+                    );
+                  })}
+                </tr>
               );
             })}
-          </tr>
-        </thead>
-        <tbody className="tw-text-gray-600 tw-text-sm">
-          {sampleData?.rows?.map((row, rowIndex) => {
-            return (
-              <tr
-                className={classNames(
-                  'tableBody-row',
-                  !isEven(rowIndex + 1) ? 'odd-row' : null
-                )}
-                data-testid="row"
-                key={rowIndex}>
-                {row.map((data, index) => {
-                  return (
-                    <td
-                      className="tableBody-cell"
-                      data-testid="cell"
-                      key={index}>
-                      {data ? data.toString() : '--'}
-                    </td>
-                  );
-                })}
-              </tr>
-            );
-          })}
-        </tbody>
-      </table>
+          </tbody>
+        </table>
+      ) : (
+        <div className="tw-flex tw-justify-center tw-font-medium tw-items-center tw-border tw-border-main tw-rounded-md tw-p-8">
+          No sample data available
+        </div>
+      )}
     </div>
   );
 };
diff --git a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SchemaTab.tsx b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SchemaTab.tsx
index 49bb448a259..c02341a8ee5 100644
--- a/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SchemaTab.tsx
+++ b/catalog-rest-service/src/main/resources/ui/src/components/my-data-details/SchemaTab.tsx
@@ -81,8 +81,8 @@ const SchemaTab: FunctionComponent<Props> = ({
     });
 
     return {
-      columns: updatedColumns as SampleColumns[],
-      rows: sampleData.rows,
+      columns: updatedColumns as SampleColumns[] | undefined,
+      rows: sampleData?.rows,
     };
   };