diff --git a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
index 13c582fbda..5d47e5f481 100644
--- a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
+++ b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
@@ -70,5 +70,15 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-            migrations.RunPython(update_tags_with_dbmodel)
+
+        migrations.AlterUniqueTogether(
+            name='tag',
+            unique_together=set([('db_key', 'db_category', 'db_tagtype', 'db_model')]),
+        ),
+        migrations.AlterIndexTogether(
+            name='tag',
+            index_together=set([('db_key', 'db_category', 'db_tagtype', 'db_model')]),
+        ),
+
+        migrations.RunPython(update_tags_with_dbmodel)
     ]
diff --git a/evennia/typeclasses/tags.py b/evennia/typeclasses/tags.py
index 670a245cfc..a88e68e305 100644
--- a/evennia/typeclasses/tags.py
+++ b/evennia/typeclasses/tags.py
@@ -61,8 +61,8 @@ class Tag(models.Model):
     class Meta(object):
         "Define Django meta options"
         verbose_name = "Tag"
-        unique_together = (('db_key', 'db_category', 'db_tagtype'),)
-        index_together = (('db_key', 'db_category', 'db_tagtype'),)
+        unique_together = (('db_key', 'db_category', 'db_tagtype', 'db_model'),)
+        index_together = (('db_key', 'db_category', 'db_tagtype', 'db_model'),)
 
     def __unicode__(self):
         return u"<Tag: %s%s>" % (self.db_key, "(category:%s)" % self.db_category if self.db_category else "")