diff --git a/src/Wizard.js b/src/Wizard.js
index 7d8f0f95c7..494e2f2703 100644
--- a/src/Wizard.js
+++ b/src/Wizard.js
@@ -912,6 +912,13 @@ export default class Wizard extends Webform {
       return this.setNestedValue(page, submission.data, flags, changed) || changed;
     }, false);
 
+    if (!flags.sanitize ||
+      (flags && flags.fromSubmission && (this.prefixComps.length || this.suffixComps.length) && submission._id) ||
+      (this.options.server && (this.prefixComps.length || this.suffixComps.length))
+    ) {
+      this.mergeData(this.data, submission.data);
+    }
+
     if (changed) {
       this.pageFieldLogic(this.page);
     }