diff --git a/app/models/case_log.rb b/app/models/case_log.rb
index 252b6e360..fd977e11e 100644
--- a/app/models/case_log.rb
+++ b/app/models/case_log.rb
@@ -609,7 +609,8 @@ private
   end
 
   def all_fields_completed?
-    mandatory_fields.none? { |field| public_send(field).nil? if respond_to?(field) }
+    subsection_statuses = form.subsections.map { |subsection| subsection.status(self) }.uniq
+    subsection_statuses == [:completed]
   end
 
   def all_fields_nil?