diff --git a/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/01-Overview/Grid_Demo_01_Client_Side_Filtering_Paging_And_Sorting.razor b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/01-Overview/Grid_Demo_01_Client_Side_Filtering_Paging_And_Sorting.razor
index 75600cffe..4bd565772 100644
--- a/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/01-Overview/Grid_Demo_01_Client_Side_Filtering_Paging_And_Sorting.razor
+++ b/BlazorBootstrap.Demo.RCL/Components/Pages/Grid/01-Overview/Grid_Demo_01_Client_Side_Filtering_Paging_And_Sorting.razor
@@ -1,14 +1,15 @@
 <Grid TItem="Employee1"
-      Class="table table-hover table-bordered table-striped"
-      DataProvider="EmployeesDataProvider"
       AllowFiltering="true"
       AllowPaging="true"
-      PageSize="5"
       AllowSorting="true"
       AllowSelection="true"
-      SelectionMode="GridSelectionMode.Multiple"
+      Class="table table-hover table-bordered table-striped"
+      DataProvider="EmployeesDataProvider"
+      PageSize="5"
+      Responsive="true"
+      RowKeySelector="(emp) => emp.Id"
       SelectedItemsChanged="OnSelectedItemsChanged"
-      Responsive="true">
+      SelectionMode="GridSelectionMode.Multiple">
 
     <GridColumns>
         <GridColumn TItem="Employee1" HeaderText="Id" PropertyName="Id" SortKeySelector="item => item.Id">
diff --git a/blazorbootstrap/Components/Grid/Grid.razor b/blazorbootstrap/Components/Grid/Grid.razor
index f3ceacba9..1b6771be7 100644
--- a/blazorbootstrap/Components/Grid/Grid.razor
+++ b/blazorbootstrap/Components/Grid/Grid.razor
@@ -147,7 +147,7 @@
                         {
                             var rowClass = RowClass?.Invoke(item) ?? "";
                             var detailViewRowId = IdUtility.GetNextId();
-                            <tr @key="item?.GetHashCode()" class="@rowClass" @onclick="args => RowClick(item, args)" @ondblclick="args => RowDoubleClick(item, args)" role="@(AllowRowClick ? "button" : "")">
+                            <tr @key="RowKeySelector?.Invoke(item) ?? item?.GetHashCode()" class="@rowClass" @onclick="args => RowClick(item, args)" @ondblclick="args => RowDoubleClick(item, args)" role="@(AllowRowClick ? "button" : "")">
                                 @if (AllowDetailView)
                                 {
                                     <td class="text-center">
diff --git a/blazorbootstrap/Components/Grid/Grid.razor.cs b/blazorbootstrap/Components/Grid/Grid.razor.cs
index df5870e70..63d3f37b4 100644
--- a/blazorbootstrap/Components/Grid/Grid.razor.cs
+++ b/blazorbootstrap/Components/Grid/Grid.razor.cs
@@ -995,6 +995,18 @@ private void SetFilters(IEnumerable<FilterItem> filterItems)
     [Parameter]
     public Func<TItem, string>? RowClass { get; set; }
 
+    /// <summary>
+    /// Gets or sets the function used to extract a unique key from a row item.
+    /// </summary>
+    /// <remarks>
+    /// The key returned by the function is used to uniquely identify each row in the data set.  This
+    /// is typically required for operations such as tracking changes or rendering rows efficiently. 
+    /// If not set, the item hash code will be used as the key.
+    /// Example usage: `RowKeySelector="(employee) => employee.Id"`.
+    /// </remarks>
+    [Parameter]
+    public Func<TItem, object>? RowKeySelector { get; set; }
+    
     /// <summary>
     /// Gets or sets the selected items.
     /// </summary>