diff --git a/src/store/modules/stock/actions.ts b/src/store/modules/stock/actions.ts
index c53cfd0..748aff0 100644
--- a/src/store/modules/stock/actions.ts
+++ b/src/store/modules/stock/actions.ts
@@ -149,7 +149,7 @@ const actions: ActionTree<StockState, RootState> = {
       }
 
       job?.priority && (payload['SERVICE_PRIORITY'] = job.priority.toString())
-      payload['SERVICE_TIME'] = scheduledTime || state.schedule.scheduledTime.toString()
+      payload['SERVICE_TIME'] = scheduledTime.toString() || state.schedule.scheduledTime.toString()
       job?.sinceId && (payload['sinceId'] = job.sinceId)
 
       try {
diff --git a/src/views/ScheduledRestock.vue b/src/views/ScheduledRestock.vue
index 1f454fc..d871ee7 100644
--- a/src/views/ScheduledRestock.vue
+++ b/src/views/ScheduledRestock.vue
@@ -99,7 +99,7 @@
             <ion-label>
               <p class="overline">{{ job.jobId }}</p>
                 {{ job.jobName }}
-              <p>{{ job.runTimeData.shipmentId }}</p>
+              <p>{{ job?.runTimeData?.shipmentId }}</p>
             </ion-label>
             <ion-button class="date-time-button" @click="changeRunTime(job)">{{ getTime(job.runTime) ? getTime(job.runTime) : 'Select time' }}</ion-button>
             <ion-button fill="clear" color="medium" @click="openScheduledRestockPopover($event, job)">