diff --git a/workflow/engine/classes/PmTable.php b/workflow/engine/classes/PmTable.php
index 11a1e7490..cea31f3ff 100644
--- a/workflow/engine/classes/PmTable.php
+++ b/workflow/engine/classes/PmTable.php
@@ -1026,4 +1026,13 @@ class PmTable
 
         return $type;
     }
+
+    /**
+     * Remove the folder "pmt-folder" and all the content inside
+     */
+    public static function removePmtPropelFolder()
+    {
+        $pmtPropelFolder = PATH_DB . config('system.workspace') . PATH_SEP . 'pmt-propel';
+        G::rm_dir($pmtPropelFolder);
+    }
 }
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index d751effff..3d59b1cc3 100644
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -207,6 +207,9 @@ class pmTablesProxy extends HttpProxyController
     public function save ($httpData, $alterTable = true)
     {
         try {
+            // Remove temporary Propel folder used by Report Tables and PM Tables (Bug PMC-388)
+            PmTable::removePmtPropelFolder();
+
             $reportTable = new \ProcessMaker\BusinessModel\ReportTable();
 
             return $reportTable->saveStructureOfTable((array)($httpData), $alterTable);
@@ -816,6 +819,9 @@ class pmTablesProxy extends HttpProxyController
 
             fclose($f);
 
+            // Remove temporary Propel folder used by Report Tables and PM Tables (Bug PMC-388)
+            PmTable::removePmtPropelFolder();
+
             //First Validate the file
             $reportTable = new \ProcessMaker\BusinessModel\ReportTable();