diff --git a/mail.php b/mail.php
index f0eb17a06..682f4eb4c 100755
--- a/mail.php
+++ b/mail.php
@@ -163,7 +163,7 @@ if ($smtp['pec'] == 1 && $module->name == 'Fatture di vendita') {
 }
 
 // Ottieni gli allegati dalle categorie associate al template
-$template_uploads = $template->uploads;
+$template_uploads = $template->uploads($id_record);
 if (!empty($template_uploads)) {
     $uploads = array_merge($uploads, $template_uploads->pluck('id')->toArray());
     $uploads = array_unique($uploads);
diff --git a/modules/emails/src/Mail.php b/modules/emails/src/Mail.php
index d4f954be2..591422090 100755
--- a/modules/emails/src/Mail.php
+++ b/modules/emails/src/Mail.php
@@ -279,7 +279,7 @@ class Mail extends Model
         }
 
         // Inclusione allegati predefiniti
-        $uploads = $template->uploads;
+        $uploads = $template->uploads($this->id_record);
         foreach ($uploads as $upload) {
             $this->addUpload($upload['id']);
         }
diff --git a/modules/emails/src/Template.php b/modules/emails/src/Template.php
index dca2ccadb..e87d530cc 100755
--- a/modules/emails/src/Template.php
+++ b/modules/emails/src/Template.php
@@ -86,24 +86,13 @@ class Template extends Model
     {
         return $this->belongsToMany(Categoria::class, 'em_files_categories_template', 'id_template', 'id_category');
     }
-    
-    /**
-     * Accessor che ottiene dinamicamente gli uploads in base alle categorie selezionate.
-     * Questo metodo viene chiamato quando si accede a $template->uploads come proprietà.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function getUploadsAttribute()
-    {
-        return $this->getUploadsFromCategories();
-    }
-    
+
     /**
      * Ottiene tutti gli allegati associati alle categorie del template.
      *
      * @return \Illuminate\Support\Collection
      */
-    public function getUploadsFromCategories()
+    public function uploads($id_record = null)
     {
         $uploads = [];
         
@@ -116,6 +105,7 @@ class Template extends Model
             if ($this->id_module) {
                 $files = \Models\Upload::where('id_category', $category->id)
                     ->where('id_module', $this->id_module)
+                    ->where('id_record', $id_record)
                     ->get();
                 
                 $uploads = array_merge($uploads, $files->all());