diff --git a/services/travel-memories/app/routes/write.py b/services/travel-memories/app/routes/write.py
index c074c5f..bbba9f6 100644
--- a/services/travel-memories/app/routes/write.py
+++ b/services/travel-memories/app/routes/write.py
@@ -13,6 +13,11 @@ def write():
     total = len(active_groups)
     group = active_groups[group_idx] if group_idx < total else None
     done_count = sum(1 for g in active_groups if g.status in ("written", "skipped"))
+    if group is None:
+        all_done = all(g.status in ("written", "skipped", "exported") for g in active_groups)
+        if not all_done:
+            first_incomplete = next(i for i, g in enumerate(active_groups) if g.status == "draft")
+            return redirect(url_for("write.write", album_id=album_id, group_idx=first_incomplete))
     photos = []
     if group:
         by_id = {p.id: p for p in state.photos}
@@ -86,12 +91,13 @@ def skip():
 
 
 @bp.post("/write/done")
-def done():
-    body = request.get_json()
-    album_id = body["album_id"]
+def write_done():
+    album_id = request.form["album_id"]
     state = load_state(album_id, current_app)
+    if state is None:
+        return jsonify({"ok": False, "error": "not found"}), 404
     if "write" not in state.phases_completed:
         state.phases_completed.append("write")
     state.phase = "export"
     save_state(state, current_app)
-    return jsonify({"ok": True, "redirect": f"/export?album_id={album_id}"})
+    return redirect(f"/export?album_id={album_id}")
diff --git a/services/travel-memories/app/templates/phase5.html b/services/travel-memories/app/templates/phase5.html
index 441d4a7..5d7363f 100644
--- a/services/travel-memories/app/templates/phase5.html
+++ b/services/travel-memories/app/templates/phase5.html
@@ -7,7 +7,11 @@
   </div>
 
   {% if not group %}
-  <div class="alert alert-success">All groups written or skipped. <a href="/export?album_id={{ album_id }}" class="link">Continue to export →</a></div>
+  <div class="alert alert-success mb-4">All groups written or skipped.</div>
+  <form method="post" action="/write/done">
+    <input type="hidden" name="album_id" value="{{ album_id }}">
+    <button type="submit" class="btn btn-primary">Export →</button>
+  </form>
   {% else %}
   <div class="flex gap-4">
 
@@ -101,6 +105,7 @@
 {% endblock %}
 
 {% block extra_scripts %}
+{% if group %}
 <script>
 (function() {
   var albumId = {{ album_id | tojson }};
@@ -193,4 +198,5 @@
   }
 })();
 </script>
+{% endif %}
 {% endblock %}