diff --git a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
index 7778a4ab..7000a8cc 100644
--- a/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
+++ b/app/Handlers/Events/SendIncidentEmailNotificationHandler.php
@@ -61,7 +61,8 @@ class SendIncidentEmailNotificationHandler
      */
     public function handle(IncidentHasReportedEvent $event)
     {
-        $data = $this->presenter->decorate($event->incident);
+        $incident = $this->presenter->decorate($event->incident);
+        $component = $this->presenter->decorate($event->incident->component);
 
         // Only send emails for public incidents.
         if ($event->incident->visible === 1) {
@@ -69,10 +70,11 @@ class SendIncidentEmailNotificationHandler
                 $mail = [
                     'email'           => $subscriber->email,
                     'subject'         => 'New incident reported.',
-                    'component_name'  => $event->incident->component->name,
-                    'status'          => $data->humanStatus,
-                    'htmlContent'     => $data->formattedMessage,
-                    'textContent'     => $data->message,
+                    'hasComponent'    => ($event->incident->component) ? true : false,
+                    'componentName'   => $component->name,
+                    'status'          => $incident->humanStatus,
+                    'htmlContent'     => $incident->formattedMessage,
+                    'textContent'     => $incident->message,
                     'token'           => $subscriber->token,
                     'unsubscribeLink' => route('subscribe.unsubscribe', ['code' => $subscriber->verify_code]),
                     'appUrl'          => env('APP_URL'),
diff --git a/resources/views/emails/incidents/new-html.blade.php b/resources/views/emails/incidents/new-html.blade.php
index 22442398..d52433f8 100644
--- a/resources/views/emails/incidents/new-html.blade.php
+++ b/resources/views/emails/incidents/new-html.blade.php
@@ -9,8 +9,8 @@
 
     <p>
         {!! $status !!}
-        @if(isset($incident->component))
-        ({{ $incident->component->name }})
+        @if($hasComponent)
+        ({{ $componentName }})
         @endif
     </p>
 
diff --git a/resources/views/emails/incidents/new-text.blade.php b/resources/views/emails/incidents/new-text.blade.php
index 9f72908a..07334962 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($component_name)
-({{ $component_name }})
+@if($hasComponent)
+({{ $componentName }})
 @endif
 
 {!! $textContent !!}