diff --git a/app/controllers/repp/v1/base_controller.rb b/app/controllers/repp/v1/base_controller.rb
index 053e1ac42..a4e613786 100644
--- a/app/controllers/repp/v1/base_controller.rb
+++ b/app/controllers/repp/v1/base_controller.rb
@@ -25,6 +25,16 @@ module Repp
 
       private
 
+      def set_domain
+        registrar = current_user.registrar
+        @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
+        @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
+
+        return @domain if @domain
+
+        raise ActiveRecord::RecordNotFound
+      end
+
       def set_paper_trail_whodunnit
         ::PaperTrail.request.whodunnit = current_user
       end
diff --git a/app/controllers/repp/v1/domains/contacts_controller.rb b/app/controllers/repp/v1/domains/contacts_controller.rb
index 631916a67..1705e7cc0 100644
--- a/app/controllers/repp/v1/domains/contacts_controller.rb
+++ b/app/controllers/repp/v1/domains/contacts_controller.rb
@@ -79,14 +79,6 @@ module Repp
 
         private
 
-        def set_domain
-          registrar = current_user.registrar
-          @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
-          @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
-
-          @domain
-        end
-
         def contact_create_params
           params.permit!
         end
diff --git a/app/controllers/repp/v1/domains/dnssec_controller.rb b/app/controllers/repp/v1/domains/dnssec_controller.rb
index 5d352dc3e..717210091 100644
--- a/app/controllers/repp/v1/domains/dnssec_controller.rb
+++ b/app/controllers/repp/v1/domains/dnssec_controller.rb
@@ -53,14 +53,6 @@ module Repp
 
         private
 
-        def set_domain
-          registrar = current_user.registrar
-          @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
-          @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
-
-          @domain
-        end
-
         def dnssec_params
           params.permit!
         end
diff --git a/app/controllers/repp/v1/domains/nameservers_controller.rb b/app/controllers/repp/v1/domains/nameservers_controller.rb
index e307bb1d6..ce4227bab 100644
--- a/app/controllers/repp/v1/domains/nameservers_controller.rb
+++ b/app/controllers/repp/v1/domains/nameservers_controller.rb
@@ -40,14 +40,6 @@ module Repp
 
         private
 
-        def set_domain
-          registrar = current_user.registrar
-          @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
-          @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
-
-          @domain
-        end
-
         def set_nameserver
           @nameserver = @domain.nameservers.find_by!(hostname: params[:id])
         end
diff --git a/app/controllers/repp/v1/domains/renews_controller.rb b/app/controllers/repp/v1/domains/renews_controller.rb
index e77c2e2d0..74a9ad2e2 100644
--- a/app/controllers/repp/v1/domains/renews_controller.rb
+++ b/app/controllers/repp/v1/domains/renews_controller.rb
@@ -35,16 +35,6 @@ module Repp
 
         private
 
-        def set_domain
-          registrar = current_user.registrar
-          @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
-          @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
-
-          return @domain if @domain
-
-          raise ActiveRecord::RecordNotFound
-        end
-
         def renew_params
           params.permit!
         end
diff --git a/app/controllers/repp/v1/domains/statuses_controller.rb b/app/controllers/repp/v1/domains/statuses_controller.rb
index 72bd7e7f6..413544232 100644
--- a/app/controllers/repp/v1/domains/statuses_controller.rb
+++ b/app/controllers/repp/v1/domains/statuses_controller.rb
@@ -33,16 +33,6 @@ module Repp
 
         private
 
-        def set_domain
-          registrar = current_user.registrar
-          @domain = Epp::Domain.find_by(registrar: registrar, name: params[:domain_id])
-          @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:domain_id])
-
-          return @domain if @domain
-
-          raise(ActiveRecord::RecordNotFound)
-        end
-
         def verify_status
           allowed_statuses = [DomainStatus::CLIENT_HOLD].freeze
           stat = params[:id]
diff --git a/app/controllers/repp/v1/domains_controller.rb b/app/controllers/repp/v1/domains_controller.rb
index 703d3efd2..db1ea465d 100644
--- a/app/controllers/repp/v1/domains_controller.rb
+++ b/app/controllers/repp/v1/domains_controller.rb
@@ -165,7 +165,11 @@ module Repp
       end
 
       def set_domain
-        @domain = Epp::Domain.find_by!(registrar: current_user.registrar, name: params[:id])
+        registrar = current_user.registrar
+        @domain = Epp::Domain.find_by(registrar: registrar, name: params[:id])
+        @domain ||= Epp::Domain.find_by!(registrar: registrar, name_puny: params[:id])
+
+        @domain
       end
 
       def set_authorized_domain