diff --git a/lib/custom_wizard/wizard.rb b/lib/custom_wizard/wizard.rb
index 8f5a897f..7c25afc3 100644
--- a/lib/custom_wizard/wizard.rb
+++ b/lib/custom_wizard/wizard.rb
@@ -278,7 +278,7 @@ class CustomWizard::Wizard
   def current_submission
     @current_submission ||= begin
       if submissions.present?
-        unsubmitted = submissions.select { |submission| !submission.submitted_at }
+        unsubmitted = unsubmitted_submissions
         unsubmitted.present? ? unsubmitted.first : CustomWizard::Submission.new(self)
       else
         CustomWizard::Submission.new(self)
@@ -286,6 +286,10 @@ class CustomWizard::Wizard
     end
   end
 
+  def unsubmitted_submissions
+    submissions&.select { |submission| !submission.submitted_at }
+  end
+
   def final_cleanup!
     if id == user.custom_fields['redirect_to_wizard']
       user.custom_fields.delete('redirect_to_wizard')