diff --git a/app/controllers/epp/polls_controller.rb b/app/controllers/epp/polls_controller.rb
index 69dd24106..26df210c1 100644
--- a/app/controllers/epp/polls_controller.rb
+++ b/app/controllers/epp/polls_controller.rb
@@ -8,8 +8,8 @@ class Epp::PollsController < EppController
 
   def req_poll
     @message = current_user.queued_messages.last
-    render_epp_response 'epp/poll/poll_no_messages' and return unless @message
 
+    render_epp_response 'epp/poll/poll_no_messages' and return unless @message
     if @message.attached_obj_type && @message.attached_obj_id
       @object = Object.const_get(@message.attached_obj_type).find(@message.attached_obj_id)
     end
diff --git a/app/controllers/epp_controller.rb b/app/controllers/epp_controller.rb
index 9f30d2e8a..3a5211de5 100644
--- a/app/controllers/epp_controller.rb
+++ b/app/controllers/epp_controller.rb
@@ -37,6 +37,7 @@ class EppController < ApplicationController
   end
 
   def update_epp_session
+    iptables_counter_update
     e_s = epp_session
     return if e_s.new_record?
 
@@ -98,7 +99,6 @@ class EppController < ApplicationController
     @response = render_to_string(*args)
     render xml: @response
     write_to_epp_log
-    iptables_counter_update
   end
 
   # VALIDATION