diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 4ba21c00..7d0db4ed 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -128,7 +128,7 @@ public class CanvasController {
                     long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ;
                     Double frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ;
                     drawFps(frameRate.intValue());
-                    raceViewController.checkForPositionChange();
+//                    raceViewController.checkForPositionChange();
                 }
 
                 // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 5adba02c..e7eb3b90 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -522,4 +522,11 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     Stage getStage() {
         return stage;
     }
+
+    public static boolean sparkLineStatus(Integer yachtId) {
+        if (sparklineData.containsKey(yachtId)){
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java
index ec1110a3..5b19046f 100644
--- a/src/main/java/seng302/models/Yacht.java
+++ b/src/main/java/seng302/models/Yacht.java
@@ -107,9 +107,9 @@ public class Yacht {
     }
 
     public void setLegNumber(Integer legNumber) {
-        if (legNumber != this.legNumber && colour != null && position != "-") {
-            RaceViewController.updateYachtPositionSparkline(this, legNumber);
-        }
+//        if (colour != null  && position != "-" && legNumber != this.legNumber&& RaceViewController.sparkLineStatus(sourceID)) {
+//            RaceViewController.updateYachtPositionSparkline(this, legNumber);
+//        }
         this.legNumber = legNumber;
 
     }