diff --git a/package-lock.json b/package-lock.json
index a17395140..b97ca1b0c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.20",
+  "version": "5.6.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "business-create-ui",
-      "version": "5.6.20",
+      "version": "5.6.21",
       "dependencies": {
         "@babel/compat-data": "^7.21.5",
         "@bcrs-shared-components/approval-type": "1.0.19",
diff --git a/package.json b/package.json
index 8ee0345e6..b2185a843 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "business-create-ui",
-  "version": "5.6.20",
+  "version": "5.6.21",
   "private": true,
   "appName": "Create UI",
   "sbcName": "SBC Common Components",
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index 0576c56fc..ea8b939b0 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -291,6 +291,13 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
         // restore numbered name
         this.setNameRequestApprovedName(nameRequest.legalName)
         break
+      default:
+        // fallback for draft created without Correct Name Option
+        // NB: do not restore Name Request data
+        // it will be reloaded from NR endpoint in App.vue
+        if (nameRequest.nrNumber) {
+          this.setCorrectNameOption(CorrectNameOptions.CORRECT_NEW_NR)
+        }
     }
 
     // restore Name Translations