diff --git a/app/CachetHq/Cachet/Controllers/Api/IncidentController.php b/app/CachetHq/Cachet/Controllers/Api/IncidentController.php
index e5d71582..2c25e4ed 100644
--- a/app/CachetHq/Cachet/Controllers/Api/IncidentController.php
+++ b/app/CachetHq/Cachet/Controllers/Api/IncidentController.php
@@ -74,7 +74,7 @@ class IncidentController extends DingoController {
     private function _saveIncident($incident) {
         if ($incident->isValid()) {
             try {
-                $component = $incident->parent;
+                $component = $incident->component;
                 if (!$component) {
                     App::abort(400, 'Invalid component specified');
                 }
diff --git a/app/CachetHq/Cachet/Transformers/IncidentTransformer.php b/app/CachetHq/Cachet/Transformers/IncidentTransformer.php
index dad12803..1882f879 100644
--- a/app/CachetHq/Cachet/Transformers/IncidentTransformer.php
+++ b/app/CachetHq/Cachet/Transformers/IncidentTransformer.php
@@ -8,7 +8,7 @@ use League\Fractal\TransformerAbstract;
 class IncidentTransformer extends TransformerAbstract {
 
     public function transform(Incident $incident) {
-        $component = $incident->parent;
+        $component = $incident->component;
         $transformer = $component->getTransformer();
 
         return [
diff --git a/app/controllers/RSSController.php b/app/controllers/RSSController.php
index 9cabbb7f..055a74f3 100644
--- a/app/controllers/RSSController.php
+++ b/app/controllers/RSSController.php
@@ -17,7 +17,7 @@ class RSSController extends Controller {
             $feed->item([
                 'title'         => $incident->name,
                 'message'       => $incident->message,
-                'component'     => $incident->parent->name,
+                'component'     => $incident->component->name,
                 'status'        => $incident->humanStatus,
                 'created_at'    => $incident->created_at,
                 'updated_at'    => $incident->updated_at