diff --git a/README_TESTED_SENSORS.md b/README_TESTED_SENSORS.md
index db91496ae..197dcf434 100644
--- a/README_TESTED_SENSORS.md
+++ b/README_TESTED_SENSORS.md
@@ -22,19 +22,13 @@ However, often only one value is provided.
 
 * Garmin Speed Sensor 2
   * Has updatable firmware that requires an account for garmin.com
-  * This sensor reports speed data as cadence.
-    A workaround is in place.
-
 * Wahoo Speed (Model: WFRPMSPD)
-
 * CooSpo cadence and speed sensor (model: BK467)
 
 ### Cadence
 
 * Garmin Cadence Sensor 2
 * Wahoo Cadence (Model: WFPODCAD2)
-  This sensor reports cadence data as speed.
-  A workaround is in place.
 
 ## 0x1818: Power Measurement
 
diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
index 4731f3d0e..835e67914 100644
--- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothConnectionManager.java
@@ -203,11 +203,6 @@ public abstract class BluetoothConnectionManager<DataType> {
                 return cadenceAndSpeed.getCadence();
             }
 
-            //Workaround for Wahoo CADENCE: this sensor reports speed (instead of cadence)
-            if (cadenceAndSpeed.getDistanceSpeed() != null) {
-                return new SensorDataCycling.Cadence(cadenceAndSpeed.getDistanceSpeed());
-            }
-
             return null;
         }
     }
@@ -234,11 +229,6 @@ public abstract class BluetoothConnectionManager<DataType> {
                 return cadenceAndSpeed.getDistanceSpeed();
             }
 
-            // Workaround for Garmin Speed Sensor 2: provides cadence (instead of speed)
-            if (cadenceAndSpeed.getCadence() != null) {
-                return new SensorDataCycling.DistanceSpeed(cadenceAndSpeed.getSensorAddress(), cadenceAndSpeed.getSensorName(), (int) cadenceAndSpeed.getCadence().getCrankRevolutionsCount(), cadenceAndSpeed.getCadence().getCrankRevolutionsTime());
-            }
-
             return null;
         }
     }