diff --git a/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAverageSpeedParser.java b/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAverageSpeedParser.java
index eb598f7d2c..c4d89e6443 100644
--- a/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAverageSpeedParser.java
+++ b/core/src/main/java/com/graphhopper/routing/util/parsers/BikeCommonAverageSpeedParser.java
@@ -160,8 +160,9 @@ else if (way.hasTag("bicycle", "yes"))
             speed = PUSHING_SECTION_SPEED; // unknown surface
         } else if (way.hasTag("service")) {
             speed = highwaySpeeds.get("living_street");
-        } else if ("track".equals(highwayValue) ||
-                   "bridleway".equals(highwayValue) ) {
+        } else if ("bridleway".equals(highwayValue) && surfaceSpeed != null ) {
+              speed = surfaceSpeed;
+        } else if ("track".equals(highwayValue) {
             if (surfaceSpeed != null)
                 speed = surfaceSpeed;
             else if (trackTypeSpeeds.containsKey(trackTypeValue))