diff --git a/app/models/account_deletion.rb b/app/models/account_deletion.rb
index 7b1886269..a8918d587 100644
--- a/app/models/account_deletion.rb
+++ b/app/models/account_deletion.rb
@@ -5,6 +5,7 @@
 class AccountDeletion < ActiveRecord::Base
   include Diaspora::Federated::Base
 
+  scope :uncompleted, -> { where('completed_at is null') }
 
   belongs_to :person
   after_commit :queue_delete_account, :on => :create
diff --git a/lib/tasks/accounts.rake b/lib/tasks/accounts.rake
index 91bfd7a02..fb79a2730 100644
--- a/lib/tasks/accounts.rake
+++ b/lib/tasks/accounts.rake
@@ -1,9 +1,9 @@
 namespace :accounts do
   desc "Run deletions"
   task :run_deletions => :environment do
-    if ::AccountDeletion.count > 0
+    if ::AccountDeletion.uncompleted.count > 0
       puts "Running account deletions.."
-      ::AccountDeletion.find_each do |account_delete|
+      ::AccountDeletion.uncompleted.find_each do |account_delete|
         account_delete.perform!
       end
       puts "OK."