diff --git a/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.html b/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.html
index 2403b61bb1..72ca80508b 100644
--- a/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.html
+++ b/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.html
@@ -49,7 +49,7 @@ <h4 class="slds-text-heading_small slds-m-bottom_xx-small">
                         </p>
                     </div>
                     <div class="slds-col slds-p-left_xx-large slds-size_1-of-3">
-                        <lightning-input label="Sync Start Date" type="date" date-style="short" variant="label-hidden" value={syncStartDate} onchange={updateSyncStartDate} placeholder="Select Sync Start Date..." disabled={hasSynced}></lightning-input>
+                        <lightning-input data-id="syncStartDate" label="Sync Start Date" type="date" date-style="short" variant="label-hidden" required={pollingEnabled} value={syncStartDate} onchange={updateSyncStartDate} placeholder="Select Sync Start Date..." disabled={hasSynced}></lightning-input>
                     </div>
                 </div>
 
diff --git a/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.js b/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.js
index f1cd1f9739..aefc540b73 100644
--- a/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.js
+++ b/sfdx/force-app/main/default/lwc/syncPreferencesStep/syncPreferencesStep.js
@@ -160,11 +160,15 @@ export default class SyncPreferencesStep extends LightningElement {
                 return;
             }
             this.stripeAccountId = responseData.results.stripe_account_id;
-            this.lastSynced = new Date(responseData.results.last_synced * 1000).toLocaleString(undefined, {year:'numeric', month:'numeric', day: '2-digit', hour: 'numeric', minute:'2-digit', timeZoneName:'short'});
+            if (responseData.results.last_synced) {
+                this.lastSynced = new Date(responseData.results.last_synced * 1000).toLocaleString(undefined, {year:'numeric', month:'numeric', day: '2-digit', hour: 'numeric', minute:'2-digit', timeZoneName:'short'});
+            }
             this.isM = responseData.results.default_currency;
             this.defaultCurrency = responseData.results.default_currency;
             this.syncRecordRetention = responseData.results.sync_record_retention;
-            this.syncStartDate = new Date(responseData.results.sync_start_date * 1000).toISOString();
+            if (responseData.results.sync_start_date && responseData.results.sync_start_date !== "0") {
+                this.syncStartDate = new Date(responseData.results.sync_start_date * 1000).toISOString();
+            }
             this.apiPercentageLimit = responseData.results.api_percentage_limit;
             this.cpqTermUnit = responseData.results.cpq_term_unit;
             this.isCpqInstalled = responseData.results.isCpqInstalled;
@@ -357,6 +361,12 @@ export default class SyncPreferencesStep extends LightningElement {
 
             // confirm they wish to initialize polling
             if (this.pollingEnabledChanged && this.hasSynced === false && this.pollingEnabled) {
+                const startDateEle = this.template.querySelector('[data-id="syncStartDate"]');
+                if (startDateEle.checkValidity() === false) {
+                    startDateEle.reportValidity();
+                    this.showToast("A Sync Start Date must be set.", 'error', 'sticky');
+                    return;
+                }
                 const formattedDate = new Date(this.syncStartDate).toLocaleDateString();
                 const alertMsg = POLLING_FIRST_ENABLE_ALERT_TEMPLATE.replace('SYNC_START_DATE', formattedDate);
 
@@ -375,6 +385,9 @@ export default class SyncPreferencesStep extends LightningElement {
                     }));
                     return;
                 }
+
+                // hack to make the sync start date input disable
+                this.lastSynced = 'Scheduled';
             }
 
             if((this.apiPercentageLimit < 100 && this.apiPercentageLimit > 0) && (this.syncRecordRetention < 1000000 && this.syncRecordRetention > 100)) {