diff --git a/Endpoints/StateEndpoints.cs b/Endpoints/StateEndpoints.cs
index fb6b4dd..12d0de4 100644
--- a/Endpoints/StateEndpoints.cs
+++ b/Endpoints/StateEndpoints.cs
@@ -14,11 +14,12 @@ public static class StateEndpoints
         {
             var player = await EndpointHelpers.GetAuthenticatedPlayer(ctx, db);
             if (player is null) return Results.Unauthorized();
+            var phase = await EndpointHelpers.GetPhase(db, player.Id);
 
             var state = await db.AppState.AsNoTracking().FirstAsync();
             var summary = new
             {
-                CurrentPhase = player.CurrentPhase,
+                CurrentPhase = phase,
                 state.ResultsOpen,
                 state.UpdatedAt,
                 Players = await db.Players.CountAsync(),
@@ -32,7 +33,8 @@ public static class StateEndpoints
         {
             var player = await EndpointHelpers.GetAuthenticatedPlayer(ctx, db);
             if (player is null) return Results.Unauthorized();
-            return Results.Ok(new { player.Id, player.DisplayName, player.Username, player.IsAdmin, player.CurrentPhase });
+            var phase = await EndpointHelpers.GetPhase(db, player.Id);
+            return Results.Ok(new { player.Id, player.DisplayName, player.Username, player.IsAdmin, CurrentPhase = phase });
         });
 
         app.MapPost("/api/me/phase/next", async (HttpContext ctx, AppDbContext db, IConfiguration config) =>