diff --git a/db/migrate/20140729152420_migrate_taggable_labels.rb b/db/migrate/20140729152420_migrate_taggable_labels.rb
index f164015506d672876c7d531e880be5d38f74243d..dc28d727d9a450ad9bffcedc256f062363870d19 100644
--- a/db/migrate/20140729152420_migrate_taggable_labels.rb
+++ b/db/migrate/20140729152420_migrate_taggable_labels.rb
@@ -2,6 +2,12 @@ class MigrateTaggableLabels < ActiveRecord::Migration
   def up
     taggings = ActsAsTaggableOn::Tagging.where(taggable_type: ['Issue', 'MergeRequest'], context: 'labels')
     taggings.find_each(batch_size: 500) do |tagging|
+      # Clean up orphaned taggings while we are here
+      if tagging.taggable.blank? || tagging.tag.nil?
+        tagging.destroy
+        print 'D'
+        next
+      end
       create_label_from_tagging(tagging)
     end
   end