diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb
index c16849bd7..4cf12dab2 100644
--- a/app/controllers/admin/domains_controller.rb
+++ b/app/controllers/admin/domains_controller.rb
@@ -61,7 +61,6 @@ class Admin::DomainsController < AdminController
   end
 
   def build_associations
-    @domain.domain_statuses.build if @domain.domain_statuses.empty?
     @server_statuses = @domain.statuses.select { |x| DomainStatus::SERVER_STATUSES.include?(x) }
     @server_statuses = [nil] if @server_statuses.empty?
     @other_statuses = @domain.statuses.select { |x| !DomainStatus::SERVER_STATUSES.include?(x) }
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 586de3f73..56de6ee3d 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -288,8 +288,8 @@ class Domain < ActiveRecord::Base
   def clean_pendings!
     preclean_pendings
     self.pending_json = {}
-    domain_statuses.where(value: DomainStatus::PENDING_UPDATE).destroy_all
-    domain_statuses.where(value: DomainStatus::PENDING_DELETE).destroy_all
+    statuses.delete(DomainStatus::PENDING_UPDATE)
+    statuses.delete(DomainStatus::PENDING_DELETE)
     save
   end
 
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index fb8bd4845..e9507d955 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -383,8 +383,8 @@ class Epp::Domain < Domain
     preclean_pendings
     user  = ApiUser.find(pending_json['current_user_id'])
     frame = Nokogiri::XML(pending_json['frame'])
-    domain_statuses.where(value: DomainStatus::PENDING_UPDATE).destroy_all
-    domain_statuses.reload
+    statuses.delete(DomainStatus::PENDING_UPDATE)
+
     if update(frame, user, false)
       clean_pendings!
     end