diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb
index 05bbba9a81..449d1feef9 100644
--- a/app/controllers/epp/sessions_controller.rb
+++ b/app/controllers/epp/sessions_controller.rb
@@ -82,7 +82,6 @@ def login
     if success
       if params[:parsed_frame].css('newPW').first
         unless @api_user.update(plain_text_password: params[:parsed_frame].css('newPW').first.text)
-          response.headers['X-EPP-Returncode'] = '2500'
           handle_errors(@api_user) and return
         end
       end
@@ -93,7 +92,6 @@ def login
       epp_session.save!
       render_epp_response('login_success')
     else
-      response.headers['X-EPP-Returncode'] = '2500'
       handle_errors
     end
   end
@@ -119,7 +117,6 @@ def logout
 
     @api_user = current_user # cache current_user for logging
     epp_session.destroy
-    response.headers['X-EPP-Returncode'] = '1500'
     render_epp_response('logout')
   end
 
diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 2ed932945a..6c61e97a3f 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -22,7 +22,6 @@ def validate_against_schema
         code: 2001,
         msg: error
       }
-      response.headers['X-EPP-Returncode'] = '2200'
     end
     handle_errors and return if epp_errors.any?
   end
@@ -371,7 +370,6 @@ def update_epp_session
     if session_timeout_reached?
       @api_user = current_user # cache current_user for logging
       epp_session.destroy
-      response.headers['X-EPP-Returncode'] = '1500'
 
       epp_errors << {
         msg: t('session_timeout'),