diff --git a/src/main/java/seng302/model/ClientYacht.java b/src/main/java/seng302/model/ClientYacht.java
index 564754b0..ff544482 100644
--- a/src/main/java/seng302/model/ClientYacht.java
+++ b/src/main/java/seng302/model/ClientYacht.java
@@ -40,7 +40,7 @@ public class ClientYacht extends Observable {
     private String country;
 
     private Long estimateTimeAtFinish;
-    private Boolean sailIn = false;
+    private Boolean sailIn = true;
     private Integer currentMarkSeqID = 0;
     private Long markRoundTime;
     private Long timeTillNext;
diff --git a/src/main/java/seng302/visualiser/GameView.java b/src/main/java/seng302/visualiser/GameView.java
index aa8a9621..ffe7b005 100644
--- a/src/main/java/seng302/visualiser/GameView.java
+++ b/src/main/java/seng302/visualiser/GameView.java
@@ -674,6 +674,7 @@ public class GameView extends Pane {
 
     public void setBoatAsPlayer (ClientYacht playerYacht) {
         this.playerYacht = playerYacht;
+        playerYacht.toggleSail();
         boatObjects.get(playerYacht).setAsPlayer();
         annotations.get(playerYacht).addAnnotation(
             "velocity",
diff --git a/src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java b/src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java
index be2f7a46..5d4e4df4 100644
--- a/src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java
+++ b/src/test/java/seng302/visualiser/map/BoatSailAnimationToggleTest.java
@@ -21,9 +21,9 @@ public class BoatSailAnimationToggleTest {
 
     @Test
     public void sailToggleTest() throws Exception {
-        assertFalse(yacht.getSailIn());
-        yacht.toggleSail();
         assertTrue(yacht.getSailIn());
+        yacht.toggleSail();
+        assertFalse(yacht.getSailIn());
     }
 
 }