diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
index 1e03387cc6..dd926dbb11 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/location/MogoRTKLocation.java
@@ -63,9 +63,9 @@ public class MogoRTKLocation {
         public void onLocationChanged( Location location ) {
             if ( location != null ) {
                 CloudLocationInfo cloudLocationInfo = new CloudLocationInfo();
-                cloudLocationInfo.setAlt( location.getAltitude() );
-                cloudLocationInfo.setHeading( location.getBearing() );
                 if(location.getLatitude() != 0.0 && location.getLongitude() != 0.0){
+                    cloudLocationInfo.setAlt( location.getAltitude() );
+                    cloudLocationInfo.setHeading( location.getBearing() );
                     cloudLocationInfo.setLat( location.getLatitude() );
                     cloudLocationInfo.setLon( location.getLongitude() );
                     cloudLocationInfo.setSpeed( location.getSpeed() );