diff --git a/app/controllers/epp/polls_controller.rb b/app/controllers/epp/polls_controller.rb
index 0ce1ff5c7..57961eb82 100644
--- a/app/controllers/epp/polls_controller.rb
+++ b/app/controllers/epp/polls_controller.rb
@@ -9,7 +9,7 @@ class Epp::PollsController < EppController
   private
 
   def req_poll
-    @notification = current_user.unread_notifications.last
+    @notification = current_user.unread_notifications.order('created_at DESC').take
 
     render_epp_response 'epp/poll/poll_no_messages' and return unless @notification
     if @notification.attached_obj_type && @notification.attached_obj_id
diff --git a/test/fixtures/notifications.yml b/test/fixtures/notifications.yml
index 6955a8591..79acd4781 100644
--- a/test/fixtures/notifications.yml
+++ b/test/fixtures/notifications.yml
@@ -2,6 +2,7 @@ greeting:
   text: Welcome!
   read: false
   registrar: bestnames
+  created_at: <%= Time.zone.parse('2010-07-04') %>
 
 domain_deleted:
   text: Your domain has been deleted
diff --git a/test/integration/epp/poll_test.rb b/test/integration/epp/poll_test.rb
index 2992fca6f..884872720 100644
--- a/test/integration/epp/poll_test.rb
+++ b/test/integration/epp/poll_test.rb
@@ -24,25 +24,6 @@ class EppPollTest < ApplicationIntegrationTest
     assert_equal 'Your domain has been deleted', response_xml.at_css('msgQ msg').text
   end
 
-    request_xml = <<-XML
-      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-      <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
-        <command>
-          <poll op="req"/>
-        </command>
-      </epp>
-    XML
-    post '/epp/command/poll', { frame: request_xml }, 'HTTP_COOKIE' => 'session=api_bestnames'
-
-    xml_doc = Nokogiri::XML(response.body)
-    assert_equal 1301.to_s, xml_doc.at_css('result')[:code]
-    assert_equal 1, xml_doc.css('result').size
-    assert_equal 2.to_s, xml_doc.at_css('msgQ')[:count]
-    assert_equal notification.id.to_s, xml_doc.at_css('msgQ')[:id]
-    assert_equal Time.zone.parse('2010-07-05').iso8601, xml_doc.at_css('msgQ qDate').text
-    assert_equal 'Your domain has been deleted', xml_doc.at_css('msgQ msg').text
-  end
-
   def test_no_notifications
     registrars(:bestnames).notifications.delete_all(:delete_all)