diff --git a/app/Http/Controllers/Settings/Email.php b/app/Http/Controllers/Settings/Email.php
index 1f8e54f3c..9b8d42e7a 100644
--- a/app/Http/Controllers/Settings/Email.php
+++ b/app/Http/Controllers/Settings/Email.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Settings;
 
 use App\Abstracts\Http\Controller;
 use App\Http\Requests\Setting\Setting as Request;
+use App\Jobs\Setting\UpdateEmailTemplate;
 use App\Models\Common\Company;
 use App\Models\Common\EmailTemplate;
 use App\Utilities\Installer;
@@ -106,10 +107,10 @@ class Email extends Controller
 
         $template = EmailTemplate::alias($alias)->first();
 
-        $template->update([
+        $this->dispatch(new UpdateEmailTemplate($template, [
             'subject' => $fields[$subject_key],
             'body' => $fields[$body_key],
-        ]);
+        ]));
 
         unset($fields[$subject_key]);
         unset($fields[$body_key]);
diff --git a/app/Jobs/Common/CreateEmailTemplate.php b/app/Jobs/Setting/CreateEmailTemplate.php
similarity index 94%
rename from app/Jobs/Common/CreateEmailTemplate.php
rename to app/Jobs/Setting/CreateEmailTemplate.php
index 95ffc5a43..52d1cdea5 100644
--- a/app/Jobs/Common/CreateEmailTemplate.php
+++ b/app/Jobs/Setting/CreateEmailTemplate.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs\Common;
+namespace App\Jobs\Setting;
 
 use App\Abstracts\Job;
 use App\Interfaces\Job\HasOwner;
diff --git a/app/Jobs/Setting/DeleteEmailTemplate.php b/app/Jobs/Setting/DeleteEmailTemplate.php
new file mode 100644
index 000000000..424ae7d2f
--- /dev/null
+++ b/app/Jobs/Setting/DeleteEmailTemplate.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Jobs\Setting;
+
+use App\Abstracts\Job;
+use App\Interfaces\Job\ShouldDelete;
+
+class DeleteEmailTemplate extends Job implements ShouldDelete
+{
+    public function handle(): bool
+    {
+        \DB::transaction(function () {
+            $this->model->delete();
+        });
+
+        return true;
+    }
+}
diff --git a/app/Jobs/Setting/UpdateEmailTemplate.php b/app/Jobs/Setting/UpdateEmailTemplate.php
new file mode 100644
index 000000000..9f2ec30aa
--- /dev/null
+++ b/app/Jobs/Setting/UpdateEmailTemplate.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Jobs\Setting;
+
+use App\Abstracts\Job;
+use App\Interfaces\Job\ShouldUpdate;
+use App\Models\Common\EmailTemplate;
+
+class UpdateEmailTemplate extends Job implements ShouldUpdate
+{
+    public function handle(): EmailTemplate
+    {
+        \DB::transaction(function () {
+            $this->model->update($this->request->all());
+        });
+
+        return $this->model;
+    }
+}
diff --git a/database/seeds/EmailTemplates.php b/database/seeds/EmailTemplates.php
index cd4915722..c47c0142a 100644
--- a/database/seeds/EmailTemplates.php
+++ b/database/seeds/EmailTemplates.php
@@ -3,7 +3,7 @@
 namespace Database\Seeds;
 
 use App\Abstracts\Model;
-use App\Jobs\Common\CreateEmailTemplate;
+use App\Jobs\Setting\CreateEmailTemplate;
 use App\Traits\Jobs;
 use Illuminate\Database\Seeder;