diff --git a/src/assets/scripts/client/aircraft/AircraftModel.js b/src/assets/scripts/client/aircraft/AircraftModel.js
index 2a5b98874f..634153d67e 100644
--- a/src/assets/scripts/client/aircraft/AircraftModel.js
+++ b/src/assets/scripts/client/aircraft/AircraftModel.js
@@ -2278,7 +2278,18 @@ export default class AircraftModel {
      * @method updateAircraftTurnPhysics
      */
     updateAircraftTurnPhysics() {
-        if (this.isOnGround() || this.heading === this.targetHeading) {
+        if (this.isOnGround()) {
+            this.target.turn = null;
+
+            return;
+        }
+
+        if (_isNil(this.targetHeading)) {
+            // FIXME: Do some math here to calculate the heading to face in order to achieve the desired groundTrack.
+            this.targetHeading = this.groundTrack;
+        }
+
+        if (this.heading === this.targetHeading) {
             this.target.turn = null;
 
             return;