diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
index 58094b0bbf8..0a03094376a 100644
--- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
+++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
@@ -379,9 +379,9 @@ internal class MapboxTripSession(
         }
 
         private fun calculateRemainingWaypoints(tripStatus: TripStatus): Int {
-            val routeCoordinates = tripStatus.route?.routeOptions?.coordinatesList()
-            return if (routeCoordinates != null) {
-                val waypointsCount = routeCoordinates.size
+            val routeWaypoints = tripStatus.route?.directionsResponse?.waypoints()
+            return if (routeWaypoints != null) {
+                val waypointsCount = routeWaypoints.size
                 val nextWaypointIndex = normalizeNextWaypointIndex(
                     tripStatus.navigationStatus.nextWaypointIndex
                 )