diff --git a/src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs b/src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs
index ff6fea2c..8d7b6e73 100644
--- a/src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs
+++ b/src/Microsoft.Kusto.ServiceLayer/DataSource/KustoDataSource.cs
@@ -229,6 +229,9 @@ namespace Microsoft.Kusto.ServiceLayer.DataSource
                 cancellationToken.Register(() => CancelQuery(clientRequestProperties.ClientRequestId));
             }
             
+            var kustoCodeService = new KustoCodeService(query);
+            query = kustoCodeService.GetMinimalText(MinimalTextKind.RemoveLeadingWhitespaceAndComments);
+
             IDataReader origReader = KustoQueryProvider.ExecuteQuery(
                 KustoQueryUtils.IsClusterLevelQuery(query) ? "" : databaseName, 
                 query,