diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Pagination/PaginationState.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Pagination/PaginationState.cs
index 2da161a7af9a..4aa921fee4ed 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Pagination/PaginationState.cs
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Pagination/PaginationState.cs
@@ -10,6 +10,11 @@ namespace Microsoft.AspNetCore.Components.QuickGrid;
 /// </summary>
 public class PaginationState
 {
+    /// <summary>
+    /// Whether or not to render empty rows to fill the view.  
+    /// </summary>
+    public bool RenderFillerRows { get; set; } = true;
+
     /// <summary>
     /// Gets or sets the number of items on each page.
     /// </summary>
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt
index a5806f90a9db..fb5f3da11159 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/PublicAPI.Unshipped.txt
@@ -1,4 +1,6 @@
 #nullable enable
+Microsoft.AspNetCore.Components.QuickGrid.PaginationState.RenderFillerRows.get -> bool
+Microsoft.AspNetCore.Components.QuickGrid.PaginationState.RenderFillerRows.set -> void
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.HideColumnOptionsAsync() -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.RowClass.get -> System.Func<TGridItem, string?>?
-Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.RowClass.set -> void
\ No newline at end of file
+Microsoft.AspNetCore.Components.QuickGrid.QuickGrid<TGridItem>.RowClass.set -> void
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor
index 5228ed1d2b00..134583659d4a 100644
--- a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor
+++ b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/QuickGrid.razor
@@ -48,8 +48,7 @@
 
         // When pagination is enabled, by default ensure we render the exact number of expected rows per page,
         // even if there aren't enough data items. This avoids the layout jumping on the last page.
-        // Consider making this optional.
-        if (Pagination is not null)
+        if (Pagination is not null && Pagination.RenderFillerRows)
         {
             while (rowIndex++ < initialRowIndex + Pagination.ItemsPerPage)
             {