diff --git a/spec/factories/polls.rb b/spec/factories/polls.rb
index 735c20cb8..100029ec7 100644
--- a/spec/factories/polls.rb
+++ b/spec/factories/polls.rb
@@ -212,8 +212,14 @@ FactoryBot.define do
   factory :poll_answer, class: "Poll::Answer" do
     question factory: [:poll_question, :yes_no]
     author factory: [:user, :level_two]
-    answer { question.question_options.sample.title }
-    option { question.question_options.find_by(title: answer) }
+    option do
+      if answer
+        question.question_options.find_by(title: answer)
+      else
+        question.question_options.sample
+      end
+    end
+    after(:build) { |poll_answer| poll_answer.answer ||= poll_answer.option&.title }
   end
 
   factory :poll_partial_result, class: "Poll::PartialResult" do