diff --git a/examples/Demo/Shared/Pages/DataGrid/Pages/DataGridAutoItemsPerPagePage.razor b/examples/Demo/Shared/Pages/DataGrid/Pages/DataGridAutoItemsPerPagePage.razor
index d545bd9a6d..16fb75a262 100644
--- a/examples/Demo/Shared/Pages/DataGrid/Pages/DataGridAutoItemsPerPagePage.razor
+++ b/examples/Demo/Shared/Pages/DataGrid/Pages/DataGridAutoItemsPerPagePage.razor
@@ -41,6 +41,7 @@
         }
 
         .demo-section-example {
+            min-height: 135px!important;
             height: 100%;
         }
 
@@ -74,6 +75,7 @@
     }
 
     .demo-section-example {
+        min-height: 135px !important;
         height: 100%;
     }
 
diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
index 2d19f2910b..488cbecdbf 100644
--- a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
+++ b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
@@ -421,7 +421,7 @@ protected override Task OnParametersSetAsync()
             Pagination?.ItemsPerPage != _lastRefreshedPaginationState?.ItemsPerPage
             || Pagination?.CurrentPageIndex != _lastRefreshedPaginationState?.CurrentPageIndex;
 
-        var mustRefreshData = dataSourceHasChanged || paginationStateHasChanged || Loading is null;
+        var mustRefreshData = dataSourceHasChanged || paginationStateHasChanged || EffectiveLoadingValue;
 
         // We don't want to trigger the first data load until we've collected the initial set of columns,
         // because they might perform some action like setting the default sort order, so it would be wasteful