diff --git a/apps/planner/app/routes/api.sessions.ts b/apps/planner/app/routes/api.sessions.ts
index 3778341..26ad9c5 100644
--- a/apps/planner/app/routes/api.sessions.ts
+++ b/apps/planner/app/routes/api.sessions.ts
@@ -23,7 +23,29 @@ export async function action({ request }: Route.ActionArgs) {
     if (gpx) {
       try {
         const gpxData = await parseGpxAsync(gpx);
-        initialWaypoints = gpxData.waypoints;
+        // Use explicit waypoints if present, otherwise extract from track segments
+        if (gpxData.waypoints.length > 0) {
+          initialWaypoints = gpxData.waypoints;
+        } else if (gpxData.tracks.length > 0) {
+          const extracted: Array<{ lat: number; lon: number }> = [];
+          for (const seg of gpxData.tracks) {
+            if (seg.length === 0) continue;
+            const first = seg[0]!;
+            const prev = extracted[extracted.length - 1];
+            if (!prev || prev.lat !== first.lat || prev.lon !== first.lon) {
+              extracted.push({ lat: first.lat, lon: first.lon });
+            }
+          }
+          const lastSeg = gpxData.tracks[gpxData.tracks.length - 1]!;
+          if (lastSeg.length > 0) {
+            const last = lastSeg[lastSeg.length - 1]!;
+            const prev = extracted[extracted.length - 1];
+            if (!prev || prev.lat !== last.lat || prev.lon !== last.lon) {
+              extracted.push({ lat: last.lat, lon: last.lon });
+            }
+          }
+          initialWaypoints = extracted;
+        }
       } catch {
         // Continue with empty session if GPX is invalid
       }