diff --git a/app/validators/poll_expiration_validator.rb b/app/validators/poll_expiration_validator.rb
index ea8b08e186..34a627e205 100644
--- a/app/validators/poll_expiration_validator.rb
+++ b/app/validators/poll_expiration_validator.rb
@@ -5,9 +5,12 @@ class PollExpirationValidator < ActiveModel::Validator
   MIN_EXPIRATION = 5.minutes.freeze
 
   def validate(poll)
+    # We have a `presence: true` check for this attribute already
+    return if poll.expires_at.nil?
+
     current_time = Time.now.utc
 
-    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at.nil? || poll.expires_at - current_time > MAX_EXPIRATION
-    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if poll.expires_at.present? && (poll.expires_at - current_time).ceil < MIN_EXPIRATION
+    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_long')) if poll.expires_at - current_time > MAX_EXPIRATION
+    poll.errors.add(:expires_at, I18n.t('polls.errors.duration_too_short')) if (poll.expires_at - current_time).ceil < MIN_EXPIRATION
   end
 end