diff --git a/lib/builder.rb b/lib/builder.rb
index fab55f07..aa0e99d9 100644
--- a/lib/builder.rb
+++ b/lib/builder.rb
@@ -56,7 +56,7 @@ class CustomWizard::Builder
               params[:description] = f['description'] if f['description']
               params[:key] = f['key'] if f['key']
 
-              if @submissions.last
+              if @submissions.last && @wizard.unfinished?
                 submission = @submissions.last
                 params[:value] = submission[f['id']] if submission[f['id']]
               end
diff --git a/lib/wizard.rb b/lib/wizard.rb
index 1d35e077..f58b37b1 100644
--- a/lib/wizard.rb
+++ b/lib/wizard.rb
@@ -76,7 +76,7 @@ class CustomWizard::Wizard
       acting_user_id: @user.id,
       action: ::UserHistory.actions[:custom_wizard_step],
       context: @id,
-    ).distinct.order(:updated_at).first
+    ).distinct.order('updated_at DESC').first
 
     if most_recent
       last_finished_step = most_recent.subject