diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
index 17065991..51a35a7d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
@@ -158,6 +158,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
                 {
                     command.CommandText = BatchText;
                     command.CommandType = CommandType.Text;
+                    command.CommandTimeout = 0;
 
                     // Execute the command to get back a reader
                     using (DbDataReader reader = await command.ExecuteReaderAsync(cancellationToken))