diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index e069ee48d..08f602fb4 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -357,15 +357,18 @@ export default {
                 false
             );
 
-            if (vinPagesMixin.methods.isPhoneNumber(this.customerQuestions.emailOrSms)) {
-                const phone = this.customerQuestions.emailOrSms.replace(/[()]/g, "");
-                await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
-            } else {
-                await this.dispatchStoreAction(
-                    storeActions.SAVE_EMAIL,
-                    this.customerQuestions.emailOrSms,
-                    false
-                );
+            // if no value due to field being optional, blank both phone and email address
+            if (!this.customerQuestions.emailOrSms) {
+                await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
+                await this.dispatchStoreAction(storeActions.SAVE_EMAIL, "", false);
+            }
+            else { 
+                if (vinPagesMixin.methods.isPhoneNumber(this.customerQuestions.emailOrSms)) {
+                    const phone = this.customerQuestions.emailOrSms.replace(/[()]/g, "");
+                    await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
+                } else {
+                    await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.customerQuestions.emailOrSms, false);
+                }
             }
 
             await this.dispatchStoreAction(
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index e1b3f721e..6f6521dde 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -311,11 +311,18 @@ export default {
                 false
             );
 
-            if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
-                const phone = this.emailOrSms.replace(/[()]/g, "");
-                await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
-            } else {
-                await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+            // if no value due to field being optional, blank both phone and email address
+            if (!this.emailOrSms) {
+                await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
+                await this.dispatchStoreAction(storeActions.SAVE_EMAIL, "", false);
+            }
+            else { 
+                if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
+                    const phone = this.emailOrSms.replace(/[()]/g, "");
+                    await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
+                } else {
+                    await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+                }
             }
 
             await this.dispatchStoreAction(
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index 82c54d43a..2c93e7182 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -330,11 +330,18 @@ export default {
                     false
                 );
 
-                if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
-                    const phone = this.emailOrSms.replace(/[()]/g, "");
-                    await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
-                } else {
-                    await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+                // if no value due to field being optional, blank both phone and email address
+                if (!this.emailOrSms) {
+                    await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
+                    await this.dispatchStoreAction(storeActions.SAVE_EMAIL, "", false);
+                }
+                else { 
+                    if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
+                        const phone = this.emailOrSms.replace(/[()]/g, "");
+                        await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
+                    } else {
+                        await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+                    }
                 }
 
                 await this.dispatchStoreAction(
@@ -380,11 +387,18 @@ export default {
                     );
                 }
 
-                if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
-                    const phone = this.emailOrSms.replace(/[()]/g, "");
-                    await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
-                } else {
-                    await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+                // if no value due to field being optional, blank both phone and email address
+                if (!this.emailOrSms) {
+                    await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, "", false);
+                    await this.dispatchStoreAction(storeActions.SAVE_EMAIL, "", false);
+                }
+                else { 
+                    if (vinPagesMixin.methods.isPhoneNumber(this.emailOrSms)) {
+                        const phone = this.emailOrSms.replace(/[()]/g, "");
+                        await this.dispatchStoreAction(storeActions.SAVE_PHONE_NUMBER, phone, false);
+                    } else {
+                        await this.dispatchStoreAction(storeActions.SAVE_EMAIL, this.emailOrSms, false);
+                    }
                 }
 
                 await this.dispatchStoreAction(