diff --git a/app/Models/Activity.php b/app/Models/Activity.php
index 13e52f5619ac9..23804b0812f46 100644
--- a/app/Models/Activity.php
+++ b/app/Models/Activity.php
@@ -449,10 +449,41 @@ class Activity extends StaticModel
         $replacements['created_at'] = $this->created_at ?? '';
         $replacements['ip'] = $this->ip ?? '';
 
+        if($this->activity_type_id == 141)
+            $replacements = $this->harvestNoteEntities($replacements);
+
         return $replacements;
 
     }
 
+    private function harvestNoteEntities(array $replacements): array
+    {
+        $entities = [
+            ':invoice',
+            ':quote',
+            ':credit',
+            ':payment',
+            ':task',
+            ':expense',
+            ':purchase_order',
+            ':recurring_invoice',
+            ':recurring_expense',
+            ':client',
+            
+        ];
+
+        foreach($entities as $entity)
+        {
+            $entity_key = substr($entity, 1);
+
+            if($this?->{$entity_key})
+                $replacements = array_merge($replacements, $this->matchVar($entity));
+
+        }
+
+        return $replacements;
+    }
+
     private function matchVar(string $variable)
     {
         $system = ctrans('texts.system');
diff --git a/database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php b/database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php
new file mode 100644
index 0000000000000..6ee5ff904ed08
--- /dev/null
+++ b/database/migrations/2024_07_16_231556_2024_07_17_add_dubai_timezone.php
@@ -0,0 +1,37 @@
+<?php
+
+use App\Models\Timezone;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $t = \App\Models\Timezone::find(115);
+
+        if(!$t){
+
+            $t = new Timezone();
+            $t->id = 115;
+            $t->name = 'Asia/Dubai';
+            $t->location = '(GMT+04:00) Dubai';
+            $t->utc_offset = 14400;
+            $t->save();
+
+        }
+
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //
+    }
+};
diff --git a/database/seeders/ConstantsSeeder.php b/database/seeders/ConstantsSeeder.php
index a1e4410367f09..eb5e99cc573b9 100644
--- a/database/seeders/ConstantsSeeder.php
+++ b/database/seeders/ConstantsSeeder.php
@@ -151,6 +151,7 @@ class ConstantsSeeder extends Seeder
         $timezones[] = ['name'=>'Asia/Magadan', 'location' => '(GMT+12:00) Magadan', 'utc_offset' => 43200];
         $timezones[] = ['name'=>'Pacific/Auckland', 'location' => '(GMT+12:00) Auckland', 'utc_offset' => 43200];
         $timezones[] = ['name'=>'Pacific/Fiji', 'location' => '(GMT+12:00) Fiji', 'utc_offset' => 43200];
+        $timezones[] = ['name' => 'Asia/Dubai', 'location' => '(GMT+04:00) Dubai', 'utc_offset' => 14400];
 
         $x = 1;
         foreach ($timezones as $timezone) {