diff --git a/src/Core/Components/DataGrid/Columns/SelectColumn.cs b/src/Core/Components/DataGrid/Columns/SelectColumn.cs
index 071b1ec417..34ae31c891 100644
--- a/src/Core/Components/DataGrid/Columns/SelectColumn.cs
+++ b/src/Core/Components/DataGrid/Columns/SelectColumn.cs
@@ -195,7 +195,7 @@ public DataGridSelectMode SelectMode
     /// Null is undefined.
     /// </summary>
     [Parameter]
-    public bool? SelectAll { get; set; } = false;
+    public bool? SelectAll { get; set; }
 
     /// <summary>
     /// Gets or sets the action to be executed when the [All] checkbox is clicked.
@@ -394,7 +394,7 @@ private Icon GetIcon(bool? selected)
             {
                 DataGridSelectMode.Single => IconSelectedSingle,
                 DataGridSelectMode.SingleSticky => IconSelectedSingle,
-                _ => IconSelectedMultiple
+                _ => IconSelectedMultiple,
             };
         }
 
@@ -402,7 +402,7 @@ private Icon GetIcon(bool? selected)
         {
             DataGridSelectMode.Single => IconUnselectedSingle,
             DataGridSelectMode.SingleSticky => IconUnselectedSingle,
-            _ => IconUnselectedMultiple
+            _ => IconUnselectedMultiple,
         };
     }
 
@@ -540,10 +540,9 @@ private void RefreshHeaderContent()
     /// <summary />
     private bool? GetSelectAll()
     {
-        // Using SelectedItems only
         if (InternalGridContext != null && (Grid.Items != null || Grid.ItemsProvider != null))
         {
-            if (_selectedItems.Count == 0)
+            if (_selectedItems.Count == 0 && !InternalGridContext.Items.Any(Property))
             {
                 return false;
             }
diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
index d650ae8d63..6c82e2b9cf 100644
--- a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
+++ b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
@@ -997,7 +997,9 @@ private string AriaSortValue(ColumnBase<TGridItem> column)
     public override ValueTask DisposeAsync()
     {
         _currentPageItemsChanged.Dispose();
+#pragma warning disable MA0042 // Do not use blocking calls in an async method
         _scope?.Dispose();
+#pragma warning restore MA0042 // Do not use blocking calls in an async method
 
         return base.DisposeAsync();
     }