diff --git a/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb b/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb
new file mode 100644
index 000000000..d0d12058d
--- /dev/null
+++ b/db/migrate/20150403192408_remove_deleted_aspects_from_auto_follow_back.rb
@@ -0,0 +1,11 @@
+class RemoveDeletedAspectsFromAutoFollowBack < ActiveRecord::Migration
+  def up
+    User.where.not(auto_follow_back_aspect_id: Aspect.select(:id))
+      .where(auto_follow_back: true)
+      .update_all(auto_follow_back: false, auto_follow_back_aspect_id: nil)
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6bdcab9ca..882db2a15 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150220001357) do
+ActiveRecord::Schema.define(version: 20150403192408) do
 
   create_table "account_deletions", force: :cascade do |t|
     t.string   "diaspora_handle", limit: 255