diff --git a/app/Mail/Mail.php b/app/Mail/Mail.php
index 861bbe4e4..3cfbfba78 100644
--- a/app/Mail/Mail.php
+++ b/app/Mail/Mail.php
@@ -46,9 +46,14 @@ class Mail extends Mailable
      */
     public function content(): Content
     {
+        // Always get fresh body from the template to handle queue serialization properly
+        $viewData = $this->data;
+        $viewData['body'] = $this->emailTemplate->body ?? '';
+        $viewData['data'] = $viewData; // Ensure 'data' key exists for BladeCompiler::render
+        
         return new Content(
             html: 'components.mail.base',
-            with: $this->data,
+            with: $viewData,
         );
     }
 }
diff --git a/resources/views/components/mail/base.blade.php b/resources/views/components/mail/base.blade.php
index 05f010e3d..4c5053daa 100644
--- a/resources/views/components/mail/base.blade.php
+++ b/resources/views/components/mail/base.blade.php
@@ -1,3 +1,5 @@
 <x-mail.layout>
-    {!! Illuminate\View\Compilers\BladeCompiler::render($body, $data) !!}
+    @if(!empty($body))
+        {!! Illuminate\View\Compilers\BladeCompiler::render($body, $data ?? []) !!}
+    @endif
 </x-mail.layout>