diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
index 284d2d61..7778a4ab 100644
--- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
+++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
@@ -69,7 +69,7 @@ class SendIncidentEmailNotificationHandler
                 $mail = [
                     'email'           => $subscriber->email,
                     'subject'         => 'New incident reported.',
-                    'incident'        => $event->incident,
+                    'component_name'  => $event->incident->component->name,
                     'status'          => $data->humanStatus,
                     'htmlContent'     => $data->formattedMessage,
                     'textContent'     => $data->message,
diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php
index eeda7ad2..22442398 100644
--- a/resources/views/emails/incidents/new-html.blade.php
+++ b/resources/views/emails/incidents/new-html.blade.php
@@ -9,7 +9,7 @@
 
     <p>
         {!! $status !!}
-        @if($incident->component)
+        @if(isset($incident->component))
         ({{ $incident->component->name }})
         @endif
     </p>
diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php
index 3d6d590f..9f72908a 100644
--- a/resources/views/emails/incidents/new-text.blade.php
+++ b/resources/views/emails/incidents/new-text.blade.php
@@ -1,8 +1,8 @@
 {!! trans('cachet.subscriber.email.incident.text', ['app_name' => Setting::get('app_name')]) !!}
 
 {!! $status !!}
-@if($incident->component)
-({{ $incident->component->name }})
+@if($component_name)
+({{ $component_name }})
 @endif
 
 {!! $textContent !!}