diff --git a/src/components/AGGrid/AGGrid.stories.tsx b/src/components/AGGrid/AGGrid.stories.tsx
index 4a1b804..e5ac89d 100644
--- a/src/components/AGGrid/AGGrid.stories.tsx
+++ b/src/components/AGGrid/AGGrid.stories.tsx
@@ -297,7 +297,7 @@ const rowData = [
   argTypes: {
     variant: {
       control: 'select',
-      options: ['default', 'bordered', 'striped'],
+      options: ['default', 'card', 'bordered', 'striped'],
       description: 'Visual variant of the grid',
       table: {
         defaultValue: { summary: 'default' },
@@ -305,7 +305,7 @@ const rowData = [
     },
     size: {
       control: 'select',
-      options: ['sm', 'md', 'lg'],
+      options: ['xs', 'sm', 'md', 'lg', 'xl'],
       description: 'Size/density of the grid rows',
       table: {
         defaultValue: { summary: 'md' },
@@ -325,6 +325,28 @@ const rowData = [
         defaultValue: { summary: 'false' },
       },
     },
+    pagination: {
+      control: 'boolean',
+      description: 'Show pagination controls',
+    },
+    resizable: {
+      control: 'boolean',
+      description: 'Enable column resizing',
+    },
+    sortable: {
+      control: 'boolean',
+      description: 'Enable sorting',
+    },
+    filterable: {
+      control: 'boolean',
+      description: 'Enable filtering',
+    },
+    // Disable controls for props that can't be edited via Storybook
+    gridRef: { control: false },
+    ref: { control: false },
+    onRowClick: { control: false },
+    brandConfig: { control: false },
+    rowSelection: { control: false },
   },
 };
 
@@ -340,6 +362,11 @@ export const Default: Story = {
     variant: 'default',
     size: 'md',
     height: 400,
+    loading: false,
+    pagination: false,
+    resizable: false,
+    sortable: false,
+    filterable: false,
     columnDefs: basicColumnDefs as ColDef[],
     rowData: userData,
   },
@@ -979,6 +1006,9 @@ export const CompanyAndLinksRenderers: Story = {
         cellRendererParams: {
           maxVisible: 2,
         },
+        // Provide valueFormatter for array data to prevent AG Grid warning #48
+        valueFormatter: (params) =>
+          Array.isArray(params.value) ? params.value.join(', ') : '',
       },
     ];
 
diff --git a/src/components/AGGrid/AGGrid.tsx b/src/components/AGGrid/AGGrid.tsx
index 81a5599..9141596 100644
--- a/src/components/AGGrid/AGGrid.tsx
+++ b/src/components/AGGrid/AGGrid.tsx
@@ -101,6 +101,18 @@ export interface AGGridProps<TData = unknown>
 // Default Column Definitions
 // ============================================================================
 
+// Size to pixel height mapping for AG Grid (row heights + default container heights)
+const sizeToRowHeight: Record<
+  string,
+  { rowHeight: number; headerHeight: number; containerHeight: number }
+> = {
+  xs: { rowHeight: 28, headerHeight: 28, containerHeight: 280 },
+  sm: { rowHeight: 32, headerHeight: 32, containerHeight: 320 },
+  md: { rowHeight: 40, headerHeight: 40, containerHeight: 400 },
+  lg: { rowHeight: 48, headerHeight: 48, containerHeight: 480 },
+  xl: { rowHeight: 56, headerHeight: 56, containerHeight: 560 },
+};
+
 // Enhanced default column definitions with brand awareness
 const getDefaultColDef = (
   sortable: boolean,
@@ -158,7 +170,7 @@ function AGGridInner<TData = unknown>(
     variant,
     size,
     brand,
-    height = 400,
+    height,
     loading = false,
     columnDefs,
     rowData,
@@ -251,11 +263,20 @@ function AGGridInner<TData = unknown>(
     }
   }, [loading]);
 
+  // Get row/header heights based on size prop
+  const sizeConfig = sizeToRowHeight[size || 'md'];
+
+  // Use provided height or default based on size
+  const resolvedHeight = height ?? sizeConfig.containerHeight;
+
   return (
     <div
       className={cn(agGridVariants({ variant, size, brand }), className)}
       style={{
-        height: typeof height === 'number' ? `${height}px` : height,
+        height:
+          typeof resolvedHeight === 'number'
+            ? `${resolvedHeight}px`
+            : resolvedHeight,
         ...(brandConfig &&
           ({
             '--ag-primary-color': brandConfig.colors.primary[600],
@@ -278,6 +299,8 @@ function AGGridInner<TData = unknown>(
         pagination={pagination}
         paginationPageSize={pagination ? 50 : undefined}
         paginationPageSizeSelector={pagination ? [25, 50, 100, 200] : undefined}
+        rowHeight={sizeConfig.rowHeight}
+        headerHeight={sizeConfig.headerHeight}
         noRowsOverlayComponent={() => (
           <div className="text-muted-foreground py-8 text-center">
             {noDataMessage}