diff --git a/src/components/scans/ScanDetail.svelte b/src/components/scans/ScanDetail.svelte
index df4a0b15..e3c8631a 100644
--- a/src/components/scans/ScanDetail.svelte
+++ b/src/components/scans/ScanDetail.svelte
@@ -18,8 +18,8 @@
   $: current_runners = [];
   $: is_distance_valid = editable.distance > 0;
   $: is_everything_set =
-    editable.donor != null &&
-    ((original_data.responseType == "TRACKSCAN" && editable?.runner != null) ||
+    editable.runner != null &&
+    ((original_data.responseType === "TRACKSCAN" && editable.track != null) ||
       original_data.responseType !== "TRACKSCAN");
   $: changes_performed = !(
     JSON.stringify(original_data) === JSON.stringify(editable)
@@ -199,14 +199,15 @@
         {#if editable.valid}Valid{:else}Invalid{/if}
       </p>
     </div>
-    {#if editable.responseType === "TRACKSCAN"}
-    <div class="w-full inline-flex">
-      <label for="valid" class="block font-semibold text-gray-700">Track: </label>
-      <a
-        href="../tracks"
-        class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{editable.track.name}
-      </a>
-    </div>
+    {#if editable.responseType === 'TRACKSCAN'}
+      <div class="w-full inline-flex">
+        <label for="valid" class="block font-semibold text-gray-700">Track:
+        </label>
+        <a
+          href="../tracks"
+          class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-gray-100 text-gray-800">{editable.track.name}
+        </a>
+      </div>
     {/if}
     <div class=" w-full">
       <label