diff --git a/src/components/scans/ScanDetail.svelte b/src/components/scans/ScanDetail.svelte
index d6553d58..f054dad5 100644
--- a/src/components/scans/ScanDetail.svelte
+++ b/src/components/scans/ScanDetail.svelte
@@ -29,13 +29,14 @@
     (data) => {
       data_loaded = true;
       original_data = Object.assign(original_data, data);
+      original_data.runner = original_data.runner.id;
       editable = Object.assign(editable, original_data);
       RunnerService.runnerControllerGetAll().then(
         (val) => {
           current_runners = val.map((r) => {
             return { label: getRunnerLabel(r), value: r };
           });
-          runner = current_runners.find(r => r.value.id == editable.runner.id);
+          runner = current_runners.find(r => r.value.id == editable.runner);
         }
       );
     }
@@ -55,7 +56,6 @@
       let postdata = {};
       if (original_data.responseType === "TRACKSCAN") {
         postdata = Object.assign(postdata, editable);
-        postdata.runner = postdata.runner.id;
         postdata.track = postdata.track.id;
         ScanService.scanControllerPutTrackScan(original_data.id, postdata)
           .then((resp) => {
@@ -70,7 +70,6 @@
           .catch((err) => {});
       } else {
         postdata = Object.assign(postdata, editable);
-        postdata.runner = postdata.runner.id;
         ScanService.scanControllerPut(original_data.id, postdata)
           .then((resp) => {
             Object.assign(original_data, editable);
@@ -153,9 +152,9 @@
       </div>
     </div>
     <div class="mb-8 text-3xl font-extrabold leading-tight">
-      {original_data.runner.firstname}
-      {original_data.runner.middlename || ''}
-      {original_data.runner.lastname}
+      {runner.value?.firstname}
+      {runner.value?.middlename || ''}
+      {runner.value?.lastname}
       #{original_data.id}
       <span data-id="donation_actions_${original_data.id}">
         {#if store.state.jwtinfo.userdetails.permissions.includes('SCAN:DELETE')}
@@ -235,7 +234,7 @@
         noOptionsMessage={$_('no-runners-found')}
         bind:selectedValue={runner}
         on:select={(selectedValue) => {
-          editable.runner = selectedValue.detail.value;
+          editable.runner = selectedValue.detail.value.id;
         }}
         on:clear={() => (editable.runner = null)} />
     </div>