diff --git a/.vscode/launch.json b/.vscode/launch.json
index 07488098..dde42e99 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -50,8 +50,8 @@
         "AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=raven;Database=AyaNova;CommandTimeout=120;",
         //"AYANOVA_DB_CONNECTION": "Server=localhost;Username=postgres;Password=abraxis;Database=AyaNova;CommandTimeout=120;",
         "AYANOVA_USE_URLS": "http://*:7575;",
-        "AYANOVA_REPORT_RENDERING_TIMEOUT": "20000",
-        "AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3",
+        //"AYANOVA_REPORT_RENDERING_TIMEOUT": "20000",
+        //"AYANOVA_REPORT_RENDERING_MAX_INSTANCES": "3",
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",
         "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles",
diff --git a/server/AyaNova/biz/ReportBiz.cs b/server/AyaNova/biz/ReportBiz.cs
index 70819f73..abca7422 100644
--- a/server/AyaNova/biz/ReportBiz.cs
+++ b/server/AyaNova/biz/ReportBiz.cs
@@ -417,7 +417,7 @@ namespace AyaNova.Biz
 
 
             //Default timeout for each operation of report generation
-            var WaitTimeout = new WaitForFunctionOptions() { Timeout = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT };
+            // var WaitTimeout = new WaitForFunctionOptions() { Timeout = ServerBootConfig.AYANOVA_REPORT_RENDERING_TIMEOUT*10 };
 
             //includeWoItemDescendants?
             reportRequest.IncludeWoItemDescendants = report.IncludeWoItemDescendants;
@@ -493,6 +493,8 @@ namespace AyaNova.Biz
                 //track this process so it can be cancelled if it times out
                 ReportRenderManager.AddProcess(browser.Process.Id);
 
+                page.DefaultTimeout = 0;//infinite timeout as we are controlling how long the process can live for with the reportprocessmanager
+
                 try
                 {
 
@@ -611,7 +613,7 @@ namespace AyaNova.Biz
                     log.LogDebug($"Calling ayPreRender...");
 
                     //PRE_RENDER WITH TIMEOUT
-                    await page.WaitForExpressionAsync($"ayPreRender({ReportDataObject})", WaitTimeout);
+                    await page.WaitForExpressionAsync($"ayPreRender({ReportDataObject})");
 
                     //compile the template
                     log.LogDebug($"Calling Handlebars.compile...");