diff --git a/app/models/form.rb b/app/models/form.rb
index df39a8e1d..eb6456b9b 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -87,7 +87,7 @@ class Form
     next_subsection_id_index = subsection_ids.index(subsection.id) + 1
     next_subsection = get_subsection(subsection_ids[next_subsection_id_index])
 
-    if subsection.id == "declaration" && case_log.status != "completed"
+    if subsection_ids[subsection_ids.length - 1] == subsection.id && case_log.status != "completed"
       next_subsection = get_subsection(subsection_ids[0])
     end