diff --git a/distribution_fe/app/(dashboard)/procurement/grn/_components/grn-client.tsx b/distribution_fe/app/(dashboard)/procurement/grn/_components/grn-client.tsx
index 8789dde..842b9e0 100644
--- a/distribution_fe/app/(dashboard)/procurement/grn/_components/grn-client.tsx
+++ b/distribution_fe/app/(dashboard)/procurement/grn/_components/grn-client.tsx
@@ -3,7 +3,7 @@
 import { useState, useEffect, useCallback, useMemo } from 'react'
 import { useRouter } from 'next/navigation'
 import { HugeiconsIcon } from '@hugeicons/react'
-import { Add01Icon } from '@hugeicons/core-free-icons'
+import { Add01Icon, PackageDeliveredIcon } from '@hugeicons/core-free-icons'
 import { DataTable } from '@/components/shared/data-table'
 import type { TableConfig } from '@/components/shared/data-table'
 import { Button } from '@/components/ui/button'
@@ -11,6 +11,7 @@ import { toast } from '@/components/ui/toast'
 import { grn as grnApi, getApiError, getPaginatedItems } from '@/lib/api/index'
 import type { GrnResponse } from '@/types/api'
 import { GrnViewSheet } from './grn-view-sheet'
+import { EmptyState } from '@/components/shared/empty-state'
 
 const fmtDate = (v: string) =>
   new Date(v).toLocaleDateString('en-GB', { day: '2-digit', month: 'short', year: 'numeric' })
@@ -53,7 +54,19 @@ export function GrnClient() {
     rowKey: 'id',
     serverSide: true,
     stickyHeader: true,
-    emptyMessage: 'No goods receipts found.',
+    emptyState: (
+      <EmptyState
+        icon={PackageDeliveredIcon}
+        title="No goods receipts yet"
+        description="GRNs appear here once goods are received against a purchase order or booked as a direct receipt."
+        action={
+          <Button size="sm" onClick={() => router.push('/procurement/grn/new')}>
+            <HugeiconsIcon icon={Add01Icon} size={14} />
+            New GRN
+          </Button>
+        }
+      />
+    ),
     pagination: { enabled: true, pageSize, pageSizeOptions: [10, 20, 50] },
     columns: [
       {
diff --git a/distribution_fe/components/shared/data-table/data-table.tsx b/distribution_fe/components/shared/data-table/data-table.tsx
index f86475b..c5cd9dc 100644
--- a/distribution_fe/components/shared/data-table/data-table.tsx
+++ b/distribution_fe/components/shared/data-table/data-table.tsx
@@ -620,9 +620,11 @@ export function DataTable<T extends object>({
           </div>
         ))}
         {!loading && displayData.length === 0 && (
-          <div className="h-32 flex items-center justify-center text-muted-foreground text-sm">
-            {config.emptyMessage ?? 'No records found.'}
-          </div>
+          config.emptyState ?? (
+            <div className="h-32 flex items-center justify-center text-muted-foreground text-sm">
+              {config.emptyMessage ?? 'No records found.'}
+            </div>
+          )
         )}
         {!loading && displayData.map(row => (
           <MobileCard
@@ -710,9 +712,13 @@ export function DataTable<T extends object>({
               <TableRow>
                 <TableCell
                   colSpan={visibleColumns.length + (config.selectable ? 1 : 0) + (config.expandable ? 1 : 0)}
-                  className="h-32 text-center text-muted-foreground"
+                  className="p-0"
                 >
-                  {config.emptyMessage ?? 'No records found.'}
+                  {config.emptyState ?? (
+                    <div className="h-32 flex items-center justify-center text-muted-foreground text-sm">
+                      {config.emptyMessage ?? 'No records found.'}
+                    </div>
+                  )}
                 </TableCell>
               </TableRow>
             )}
diff --git a/distribution_fe/components/shared/data-table/types.ts b/distribution_fe/components/shared/data-table/types.ts
index ee84db2..9edb03e 100644
--- a/distribution_fe/components/shared/data-table/types.ts
+++ b/distribution_fe/components/shared/data-table/types.ts
@@ -119,6 +119,8 @@ export interface TableConfig<T = object> {
   exportable?: boolean | ExportConfig;
   density?: 'compact' | 'normal' | 'comfortable';
   emptyMessage?: string;
+  /** Custom rendered empty state. Overrides emptyMessage when both are provided. */
+  emptyState?: React.ReactNode;
   rowClass?: (row: T) => string;
   isRowSelectable?: (row: T) => boolean;
   expandRender?: (row: T) => React.ReactNode;