diff --git a/database/factories/ProcessFilesFactory.php b/database/factories/ProcessFilesFactory.php
index 61161d899..2d9c84e59 100644
--- a/database/factories/ProcessFilesFactory.php
+++ b/database/factories/ProcessFilesFactory.php
@@ -8,7 +8,7 @@ $factory->define(\ProcessMaker\Model\ProcessFiles::class, function(Faker $faker)
         'PRO_UID' => '',
         'USR_UID' => '',
         'PRF_UPDATE_USR_UID' => '',
-        'PRF_PATH' => '',
+        'PRF_PATH' => 'dummy_path',
         'PRF_TYPE' => '',
         'PRF_EDITABLE' => 1,
         'PRF_CREATE_DATE' => $faker->dateTime(),
diff --git a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/FilesManagerTest.php b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/FilesManagerTest.php
index 650e795d2..64331b600 100644
--- a/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/FilesManagerTest.php
+++ b/tests/unit/workflow/engine/src/ProcessMaker/BusinessModel/FilesManagerTest.php
@@ -46,12 +46,16 @@ class FilesManagerTest extends TestCase
      */
     public function it_should_deleted_public_files_when_not_exist()
     {
-        $proUid = G::generateUniqueID();
-        $prfUid = G::generateUniqueID();
+        $processFiles = factory(ProcessFilesModel::class)->create();
+
+        $emailEvent = factory(EmailEventModel::class)->create([
+            'PRF_UID' => $processFiles->PRF_UID
+        ]);
+
         $filesManager = new FilesManager();
 
         $this->expectException(Exception::class);
-        $filesManager->deleteProcessFilesManager($proUid, $prfUid);
+        $filesManager->deleteProcessFilesManager($emailEvent->PRJ_UID, $processFiles->PRF_UID, true);
     }
 
     /**
@@ -203,6 +207,6 @@ class FilesManagerTest extends TestCase
         $filesManager = new FilesManager();
 
         $this->expectException(Exception::class);
-        $filesManager->deleteProcessFilesManager($process->PRO_UID, $processFiles->PRF_UID);
+        $filesManager->deleteProcessFilesManager($process->PRO_UID, $processFiles->PRF_UID, true);
     }
 }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
index 64fdab430..a3ed66f63 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
@@ -683,49 +683,52 @@ class FilesManager
     public function deleteProcessFilesManager($proUid, $prfUid, $verifyingRelationship = false)
     {
         try {
-            $path = '';
-            $criteriaProcessFiles = new Criteria("workflow");
-            $criteriaProcessFiles->addSelectColumn(ProcessFilesPeer::PRF_PATH);
-            $criteriaProcessFiles->add(ProcessFilesPeer::PRF_UID, $prfUid, Criteria::EQUAL);
-            $resultSet1 = ProcessFilesPeer::doSelectRS($criteriaProcessFiles);
-            $resultSet1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-            $resultSet1->next();
-            while ($row = $resultSet1->getRow()) {
-                $path = $row['PRF_PATH'];
-                $resultSet1->next();
-            }
-            if ($path == '') {
-                throw new Exception(G::LoadTranslation("ID_INVALID_VALUE_FOR", array('prf_uid')));
-            }
-
             $relationshipEmailEvent = false;
-            $criteria = new Criteria("workflow");
-            $criteria->addSelectColumn(EmailEventPeer::PRF_UID);
-            $criteria->add(EmailEventPeer::PRF_UID, $prfUid, Criteria::EQUAL);
-            $resultSet2 = EmailEventPeer::doSelectRS($criteria);
-            $resultSet2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
-            $resultSet2->next();
-            while ($row = $resultSet2->getRow()) {
-                $relationshipEmailEvent = true;
-                $resultSet2->next();
-            }
+            if ($verifyingRelationship) {
+                $criteriaEmailEvent = new Criteria('workflow');
+                $criteriaEmailEvent->addSelectColumn(EmailEventPeer::PRF_UID);
+                $criteriaEmailEvent->add(EmailEventPeer::PRF_UID, $prfUid, Criteria::EQUAL);
+                $resultSet1 = EmailEventPeer::doSelectRS($criteriaEmailEvent);
+                $resultSet1->setFetchmode(ResultSet::FETCHMODE_ASSOC);
 
-            $path = str_replace("\\", "/", $path);
-            $fileName = basename($path);
-            if ($relationshipEmailEvent && !$verifyingRelationship) {
-                throw new Exception(G::LoadTranslation(G::LoadTranslation('ID_CANNOT_REMOVE_TEMPLATE_EMAIL_EVENT', [$fileName])));
-            }
-
-            $path = PATH_DATA_MAILTEMPLATES . $proUid . "/" . $fileName;
-            if (file_exists($path) && !is_dir($path)) {
-                unlink($path);
-            } else {
-                $path = PATH_DATA_PUBLIC . $proUid . "/" . $fileName;
-                if (file_exists($path) && !is_dir($path)) {
-                    unlink($path);
+                if ($resultSet1->next()) {
+                    $relationshipEmailEvent = true;
                 }
             }
 
+            $criteriaProcessFiles = new Criteria('workflow');
+            $criteriaProcessFiles->addSelectColumn(ProcessFilesPeer::PRF_PATH);
+            $criteriaProcessFiles->add(ProcessFilesPeer::PRF_UID, $prfUid, Criteria::EQUAL);
+            $resultSet2 = ProcessFilesPeer::doSelectRS($criteriaProcessFiles);
+            $resultSet2->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+
+            if ($resultSet2->next()) {
+                $row = $resultSet2->getRow();
+                $path = $row['PRF_PATH'];
+
+                if (!empty($path)) {
+                    $path = str_replace("\\", "/", $path);
+                    $fileName = basename($path);
+                    if ($relationshipEmailEvent) {
+                        throw new Exception(G::LoadTranslation(
+                            G::LoadTranslation('ID_CANNOT_REMOVE_TEMPLATE_EMAIL_EVENT',
+                                [$fileName]
+                            )));
+                    }
+
+                    $path = PATH_DATA_MAILTEMPLATES . $proUid . "/" . $fileName;
+
+                    if (file_exists($path) && !is_dir($path)) {
+                        unlink($path);
+                    } else {
+                        $path = PATH_DATA_PUBLIC . $proUid . "/" . $fileName;
+
+                        if (file_exists($path) && !is_dir($path)) {
+                            unlink($path);
+                        }
+                    }
+                }
+            }
             ProcessFilesPeer::doDelete($criteriaProcessFiles);
         } catch (Exception $e) {
             throw $e;
diff --git a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
index 0e75f8cf1..12c997f6c 100644
--- a/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
@@ -713,7 +713,7 @@ class BpmnWorkflow extends Project\Bpmn
                 if ($emailEvent->existsEvent($bpmnEvent->getPrjUid(), $bpmnEvent->getEvnUid())) {
                     $arrayEmailEventData = $emailEvent->getEmailEventData($bpmnEvent->getPrjUid(), $bpmnEvent->getEvnUid());
                     $arrayEmailEventData = array_change_key_case($arrayEmailEventData, CASE_UPPER);
-                    $emailEvent->delete($bpmnEvent->getPrjUid(), $arrayEmailEventData["EMAIL_EVENT_UID"], true);
+                    $emailEvent->delete($bpmnEvent->getPrjUid(), $arrayEmailEventData["EMAIL_EVENT_UID"], true, false);
                 }
             }