diff --git a/workflow/engine/classes/WsBase.php b/workflow/engine/classes/WsBase.php
index e437c3e78..64e219d30 100644
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -1846,7 +1846,9 @@ class WsBase
                     ob_start();
                     print_r($variables);
                     $cdata = ob_get_contents();
-                    ob_end_clean();
+                    if (ob_get_contents()) {
+                        ob_end_clean();
+                    }
                     $up_case = $oCase->updateCase($caseId, $oldFields);
 
                     $result = new WsResponse(
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index dc9fe8c0f..e009e986b 100644
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -954,7 +954,9 @@ class pmTablesProxy extends HttpProxyController
         }
 
         //ob_end_clean is used to close the ob_start opening at the beginning of this method.
-        ob_end_clean();
+        if (ob_get_contents()) {
+            ob_end_clean();
+        }
         return $result;
     }
 
diff --git a/workflow/engine/methods/setup/mainAjax.php b/workflow/engine/methods/setup/mainAjax.php
index d3cb2c9fa..5b3c1fd6b 100644
--- a/workflow/engine/methods/setup/mainAjax.php
+++ b/workflow/engine/methods/setup/mainAjax.php
@@ -43,7 +43,9 @@ switch ($request) {
         }
 
         $x = ob_get_contents();
-        ob_end_clean();
+        if (ob_get_contents()) {
+            ob_end_clean();
+        }
 
         ///////
         if ($_GET["menu"] == "plugins") {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ReportTable.php b/workflow/engine/src/ProcessMaker/BusinessModel/ReportTable.php
index 27ce991aa..b66cd3518 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ReportTable.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ReportTable.php
@@ -474,7 +474,9 @@ class ReportTable
 
             $buildResult = ob_get_contents();
 
-            ob_end_clean();
+            if (ob_get_contents()) {
+                ob_end_clean();
+            }
 
             //Updating additional table struture information
             $addTabData = [
@@ -572,7 +574,9 @@ class ReportTable
         } catch (Exception $e) {
             $buildResult = ob_get_contents();
 
-            ob_end_clean();
+            if (ob_get_contents()) {
+                ob_end_clean();
+            }
 
             $result->success = false;
 
@@ -833,7 +837,9 @@ class ReportTable
                 ob_start();
                 $pmTable->buildModelFor($dbsUid, $tables);
                 $buildResult = ob_get_contents();
-                ob_end_clean();
+                if (ob_get_contents()) {
+                    ob_end_clean();
+                }
 
                 $errors .= $pmTable->upgradeDatabaseFor($pmTable->getDataSource(), $tables);
             }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Table.php b/workflow/engine/src/ProcessMaker/BusinessModel/Table.php
index 6f155f7e1..5324306fa 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Table.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Table.php
@@ -379,7 +379,9 @@ class Table
         }
         $pmTable->build();
         $buildResult = ob_get_contents();
-        ob_end_clean();
+        if (ob_get_contents()) {
+            ob_end_clean();
+        }
         unset($buildResult);
 
         // Updating additional table struture information
@@ -586,7 +588,9 @@ class Table
 
         $pmTable->build();
         $buildResult = ob_get_contents();
-        ob_end_clean();
+        if (ob_get_contents()) {
+            ob_end_clean();
+        }
         unset($buildResult);
 
         $addTabData = [