diff --git a/src/FileIO/FitRideFile.cpp b/src/FileIO/FitRideFile.cpp
index c3b553d6d..d432eaa74 100644
--- a/src/FileIO/FitRideFile.cpp
+++ b/src/FileIO/FitRideFile.cpp
@@ -2836,7 +2836,10 @@ genericnext:
                             break;
                     case 6: // SPEED
                     case 73:// ENHANCED SPEED
-                            kph = value * 3.6 / 1000.0;
+                            if (field.deve_idx>-1)
+                                 native_num = -1;
+                            else
+                                 kph = value * 3.6 / 1000.0;
                             break;
                     case 7: // POWER
                             watts = value;
diff --git a/test/rowing/RowingCIQspeed.FIT b/test/rowing/RowingCIQspeed.FIT
new file mode 100644
index 000000000..1ceca76ba
Binary files /dev/null and b/test/rowing/RowingCIQspeed.FIT differ