diff --git a/visualiser/src/main/java/seng302/Mock/StreamedRace.java b/visualiser/src/main/java/seng302/Mock/StreamedRace.java
index 433c2230..dc89a0f3 100644
--- a/visualiser/src/main/java/seng302/Mock/StreamedRace.java
+++ b/visualiser/src/main/java/seng302/Mock/StreamedRace.java
@@ -65,7 +65,9 @@ public class StreamedRace extends Race {
                 boat.setCurrentLeg(legs.get(legNumber));
             }
 
-            if (boatStatus == BoatStatus.DNF) {
+            if (boatStatus == BoatStatus.RACING) {
+                boat.addTrackPoint(boat.getCurrentPosition());
+            } else if (boatStatus == BoatStatus.DNF) {
                 boat.setDnf(true);
             } else if (boatStatus == BoatStatus.FINISHED || legNumber > raceData.getLegs().size()) {
                 boatsFinished++;
diff --git a/visualiser/src/main/java/seng302/Model/Race.java b/visualiser/src/main/java/seng302/Model/Race.java
index 7ea0edcb..23ea73dc 100644
--- a/visualiser/src/main/java/seng302/Model/Race.java
+++ b/visualiser/src/main/java/seng302/Model/Race.java
@@ -142,7 +142,6 @@ public abstract class Race implements Runnable {
                         if (boat != null && !boat.isFinished()) {
                             updatePosition(boat, Math.round(1000 / lastFPS) > 20 ? 15 : Math.round(1000 / lastFPS));
                             checkPosition(boat, totalTimeElapsed);
-                            boat.addTrackPoint(boat.getCurrentPosition());
                         }
                     }
                 }