diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp
index 8f032904d..706cf65cf 100644
--- a/radio/src/telemetry/frsky.cpp
+++ b/radio/src/telemetry/frsky.cpp
@@ -544,7 +544,8 @@ void telemetryReset()
   frskyData.hub.gpsLatitude_ap = 7710;
   frskyData.hub.gpsLongitude_bp = 1006;
   frskyData.hub.gpsLongitude_ap = 8872;
-  frskyData.hub.gpsSpeed_bp = (100 * 250) / 463;
+  frskyData.hub.gpsSpeed_bp = 200;  //in knots
+  frskyData.hub.gpsSpeed_ap = 0;
   getGpsPilotPosition();
 
   frskyData.hub.gpsLatitude_bp = 4401;
@@ -554,9 +555,6 @@ void telemetryReset()
   getGpsDistance();
 #endif
 
-  frskyData.hub.gpsSpeed_bp = 100;
-  frskyData.hub.gpsSpeed_ap = 50;
-
   frskyData.hub.airSpeed = 100;
 
   frskyData.hub.cellsCount = 6;
diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp
index b7728b71f..aca6b9ff6 100644
--- a/radio/src/telemetry/frsky_sport.cpp
+++ b/radio/src/telemetry/frsky_sport.cpp
@@ -231,7 +231,6 @@ void processHubPacket(uint8_t id, uint16_t value)
 
     case GPS_SPEED_BP_ID:
       // Speed => Max speed
-      frskyData.hub.gpsSpeed_bp = frskyData.hub.gpsSpeed_bp;
       if (frskyData.hub.gpsSpeed_bp > frskyData.hub.maxGpsSpeed)
         frskyData.hub.maxGpsSpeed = frskyData.hub.gpsSpeed_bp;
       break;
@@ -385,8 +384,7 @@ void frskySportProcessPacket(uint8_t *packet)
           frskyData.hub.maxAirSpeed = frskyData.hub.airSpeed;
       }
       else if (appId >= GPS_SPEED_FIRST_ID && appId <= GPS_SPEED_LAST_ID) {
-        frskyData.hub.gpsSpeed_bp = SPORT_DATA_U32(packet);
-        frskyData.hub.gpsSpeed_bp /= 1000;
+        frskyData.hub.gpsSpeed_bp = (uint16_t) (SPORT_DATA_U32(packet)/1000);
         if (frskyData.hub.gpsSpeed_bp > frskyData.hub.maxGpsSpeed)
           frskyData.hub.maxGpsSpeed = frskyData.hub.gpsSpeed_bp;
       }