diff --git a/app/models/log.rb b/app/models/log.rb
index 49831e7d0..5df04a72f 100644
--- a/app/models/log.rb
+++ b/app/models/log.rb
@@ -98,15 +98,19 @@ class Log < ApplicationRecord
   def blank_invalid_non_setup_fields!
     setup_ids = form.setup_sections.flat_map(&:subsections).flat_map(&:questions).map(&:id)
 
-    errors.each do |error|
-      next if setup_ids.include?(error.attribute.to_s)
+    2.times do
+      next if valid?
 
-      public_send("#{error.attribute}=", nil)
-    end
+      errors.each do |error|
+        next if setup_ids.include?(error.attribute.to_s)
+
+        public_send("#{error.attribute}=", nil)
+      end
 
-    blank_compound_invalid_non_setup_fields!
+      blank_compound_invalid_non_setup_fields!
 
-    errors.clear
+      errors.clear
+    end
   end
 
   (1..8).each do |person_num|