diff --git a/app/Models/Component.php b/app/Models/Component.php
index 37a20638..d1cb1436 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Models;
 use AltThree\Validator\ValidatingTrait;
 use CachetHQ\Cachet\Models\Traits\SearchableTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
+use CachetHQ\Cachet\Models\Traits\Taggable;
 use CachetHQ\Cachet\Presenters\ComponentPresenter;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -22,7 +23,7 @@ use McCool\LaravelAutoPresenter\HasPresenter;
 
 class Component extends Model implements HasPresenter
 {
-    use SearchableTrait, SoftDeletes, SortableTrait, ValidatingTrait;
+    use SearchableTrait, SoftDeletes, SortableTrait, Taggable, ValidatingTrait;
 
     /**
      * List of attributes that have default values.
@@ -143,16 +144,6 @@ class Component extends Model implements HasPresenter
         return $this->morphMany(Meta::class, 'meta');
     }
 
-    /**
-     * Get the tags relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function tags()
-    {
-        return $this->morphMany(Taggable::class, 'taggable');
-    }
-
     /**
      * Finds all components by status.
      *
diff --git a/app/Models/Incident.php b/app/Models/Incident.php
index 2c40038f..8e41e95b 100644
--- a/app/Models/Incident.php
+++ b/app/Models/Incident.php
@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Models;
 use AltThree\Validator\ValidatingTrait;
 use CachetHQ\Cachet\Models\Traits\SearchableTrait;
 use CachetHQ\Cachet\Models\Traits\SortableTrait;
+use CachetHQ\Cachet\Models\Traits\Taggable;
 use CachetHQ\Cachet\Presenters\IncidentPresenter;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -29,7 +30,7 @@ use McCool\LaravelAutoPresenter\HasPresenter;
  */
 class Incident extends Model implements HasPresenter
 {
-    use SearchableTrait, SoftDeletes, SortableTrait, ValidatingTrait;
+    use SearchableTrait, SoftDeletes, SortableTrait, Taggable, ValidatingTrait;
 
     /**
      * Status for incident being investigated.
@@ -177,16 +178,6 @@ class Incident extends Model implements HasPresenter
         return $this->morphMany(Meta::class, 'meta');
     }
 
-    /**
-     * Get the tags relation.
-     *
-     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
-     */
-    public function tags()
-    {
-        return $this->morphMany(Taggable::class, 'taggable');
-    }
-
     /**
      * Get the updates relation.
      *
diff --git a/app/Models/Traits/Taggable.php b/app/Models/Traits/Taggable.php
new file mode 100644
index 00000000..f7c07a06
--- /dev/null
+++ b/app/Models/Traits/Taggable.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of Cachet.
+ *
+ * (c) Alt Three Services Limited
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CachetHQ\Cachet\Models\Traits;
+
+use CachetHQ\Cachet\Models\Taggable as TaggableModel;
+
+/**
+ * This is the taggable trait.
+ *
+ * @author James Brooks <james@alt-three.com>
+ */
+trait Taggable
+{
+    /**
+     * Get the tags relation.
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\MorphMany
+     */
+    public function tags()
+    {
+        return $this->morphMany(TaggableModel::class, 'taggable');
+    }
+}