diff --git a/MarkMpn.Sql4Cds.Engine.Tests/ExecutionPlanTests.cs b/MarkMpn.Sql4Cds.Engine.Tests/ExecutionPlanTests.cs
index 003c2cf1..c2a20225 100644
--- a/MarkMpn.Sql4Cds.Engine.Tests/ExecutionPlanTests.cs
+++ b/MarkMpn.Sql4Cds.Engine.Tests/ExecutionPlanTests.cs
@@ -779,7 +779,7 @@ public void GroupByDatePart()
             AssertFetchXml(aggregateFetch, @"
                 <fetch aggregate='true'>
                     <entity name='account'>
-                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' />
+                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' usertimezone='true' />
                         <attribute name='accountid' aggregate='count' alias='count' />
                         <order alias='createdon_month' />
                     </entity>
@@ -791,7 +791,7 @@ public void GroupByDatePart()
             AssertFetchXml(partitionFetch, @"
                 <fetch aggregate='true'>
                     <entity name='account'>
-                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' />
+                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' usertimezone='true' />
                         <attribute name='accountid' aggregate='count' alias='count' />
                         <order alias='createdon_month' />
                     </entity>
@@ -844,9 +844,9 @@ GROUP BY
             AssertFetchXml(aggregateFetch, @"
                 <fetch aggregate='true'>
                     <entity name='account'>
-                        <attribute name='createdon' groupby='true' alias='createdon_year' dategrouping='year' />
-                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' />
-                        <attribute name='createdon' groupby='true' alias='createdon_day' dategrouping='day' />
+                        <attribute name='createdon' groupby='true' alias='createdon_year' dategrouping='year' usertimezone='true' />
+                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' usertimezone='true' />
+                        <attribute name='createdon' groupby='true' alias='createdon_day' dategrouping='day' usertimezone='true' />
                         <attribute name='accountid' aggregate='count' alias='count' />
                         <order alias='createdon_year' />
                         <order alias='createdon_month' />
@@ -862,9 +862,9 @@ GROUP BY
             AssertFetchXml(partitionFetch, @"
                 <fetch aggregate='true'>
                     <entity name='account'>
-                        <attribute name='createdon' groupby='true' alias='createdon_year' dategrouping='year' />
-                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' />
-                        <attribute name='createdon' groupby='true' alias='createdon_day' dategrouping='day' />
+                        <attribute name='createdon' groupby='true' alias='createdon_year' dategrouping='year' usertimezone='true' />
+                        <attribute name='createdon' groupby='true' alias='createdon_month' dategrouping='month' usertimezone='true' />
+                        <attribute name='createdon' groupby='true' alias='createdon_day' dategrouping='day' usertimezone='true' />
                         <attribute name='accountid' aggregate='count' alias='count' />
                         <order alias='createdon_year' />
                         <order alias='createdon_month' />
diff --git a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/HashMatchAggregateNode.cs b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/HashMatchAggregateNode.cs
index 98d8c4c4..2e9ed70d 100644
--- a/MarkMpn.Sql4Cds.Engine/ExecutionPlan/HashMatchAggregateNode.cs
+++ b/MarkMpn.Sql4Cds.Engine/ExecutionPlan/HashMatchAggregateNode.cs
@@ -266,13 +266,6 @@ Source is FetchXmlScan fetch &&
                             canUseFetchXmlAggregate = false;
                             break;
                         }
-
-                        // FetchXML dategrouping always uses local timezone. If we're using UTC we can't use it
-                        if (!context.Options.UseLocalTimeZone)
-                        {
-                            canUseFetchXmlAggregate = false;
-                            break;
-                        }
                     }
                 }
 
@@ -411,6 +404,8 @@ Source is FetchXmlScan fetch &&
                         {
                             attribute.dategrouping = dateGrouping.Value;
                             attribute.dategroupingSpecified = true;
+                            attribute.usertimezone = context.Options.UseLocalTimeZone ? FetchBoolType.@true : FetchBoolType.@false;
+                            attribute.usertimezoneSpecified = true;
                         }
                         else if (grouping.GetType(expressionCompilationContext, out _) == typeof(SqlDateTime))
                         {