diff --git a/src/api/course/index.ts b/src/api/course/index.ts
index f473941e5..78216e338 100644
--- a/src/api/course/index.ts
+++ b/src/api/course/index.ts
@@ -196,6 +196,19 @@ export class CourseApi {
                   this.courseInfo.activeRoute.name = rte.name as string
                   this.courseInfo.activeRoute.pointTotal =
                     rte.feature.geometry.coordinates.length
+
+                  const pointIndex = this.parsePointIndex(
+                    this.courseInfo.activeRoute.pointIndex as number,
+                    rte
+                  )
+                  this.courseInfo.nextPoint = {
+                    type: RoutePoint,
+                    position: this.getRoutePoint(
+                      rte,
+                      pointIndex,
+                      !!this.courseInfo.activeRoute.reverse
+                    )
+                  }
                   this.emitCourseInfo()
                 }
               }