diff --git a/src/routes/route_check/jat_check/EditJunction.svelte b/src/routes/route_check/jat_check/EditJunction.svelte
index 9ebc60dcd5..9bc3c743a3 100644
--- a/src/routes/route_check/jat_check/EditJunction.svelte
+++ b/src/routes/route_check/jat_check/EditJunction.svelte
@@ -162,7 +162,9 @@
         {/each}
       </ol>
 
-      <p>Total JAT score: {totalScore($state.jat[junctionIdx][stage])}%</p>
+      {#if $state.jat[junctionIdx][stage].movements.length > 0}
+        <p>Total JAT score: {totalScore($state.jat[junctionIdx][stage])}%</p>
+      {/if}
     {:else}
       <DefaultButton on:click={() => (editing = null)}>Save</DefaultButton>
       <WarningButton on:click={deleteItem}>Delete</WarningButton>
diff --git a/src/routes/route_check/results.ts b/src/routes/route_check/results.ts
index fc22d4f29e..dd070e2963 100644
--- a/src/routes/route_check/results.ts
+++ b/src/routes/route_check/results.ts
@@ -347,10 +347,19 @@ function getJatResults(state: State): JunctionResult[] {
         scoreBoth += scoreLookup[m.score];
         totalPossibleBoth += 2;
       }
-      // TODO Handle 'not completed's
-      result.walkingWheeling[stage] = `${(scoreWW / totalPossibleWW) * 100}%`;
-      result.cycling[stage] = `${(scoreCycling / totalPossibleCycling) * 100}%`;
-      result.total[stage] = `${(scoreBoth / totalPossibleBoth) * 100}%`;
+
+      result.walkingWheeling[stage] =
+        totalPossibleWW > 0
+          ? `${(scoreWW / totalPossibleWW) * 100}%`
+          : "Not Completed";
+      result.cycling[stage] =
+        totalPossibleCycling > 0
+          ? `${(scoreCycling / totalPossibleCycling) * 100}%`
+          : "Not Comleted";
+      result.total[stage] =
+        totalPossibleBoth > 0
+          ? `${(scoreBoth / totalPossibleBoth) * 100}%`
+          : "Not Completed";
     }
     out.push(result);
   }