diff --git a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
index 488cbecdb..c7da3c38e 100644
--- a/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
+++ b/src/Core/Components/DataGrid/FluentDataGrid.razor.cs
@@ -393,11 +393,6 @@ protected override void OnInitialized()
     /// <inheritdoc />
     protected override Task OnParametersSetAsync()
     {
-        if (GridTemplateColumns is not null)
-        {
-            _internalGridTemplateColumns = GridTemplateColumns;
-        }
-
         // The associated pagination state may have been added/removed/replaced
         _currentPageItemsChanged.SubscribeOrMove(Pagination?.CurrentPageItemsChanged);
 
@@ -507,7 +502,7 @@ private void FinishCollectingColumns()
         {
             if (!AutoFit)
             {
-                _internalGridTemplateColumns = string.Join(" ", Enumerable.Repeat("1fr", _columns.Count));
+                _internalGridTemplateColumns = GridTemplateColumns ?? string.Join(" ", Enumerable.Repeat("1fr", _columns.Count));
             }
 
             if (_columns.Any(x => !string.IsNullOrWhiteSpace(x.Width)))