diff --git a/Endpoints/EndpointHelpers.cs b/Endpoints/EndpointHelpers.cs
index 965a456..df6d537 100644
--- a/Endpoints/EndpointHelpers.cs
+++ b/Endpoints/EndpointHelpers.cs
@@ -20,8 +20,17 @@ internal static class EndpointHelpers
 
     public static async Task<Phase> GetPhase(AppDbContext db, Guid playerId)
     {
-        var player = await db.Players.AsNoTracking().FirstOrDefaultAsync(p => p.Id == playerId);
-        return player?.CurrentPhase ?? Phase.Suggest;
+        var player = await db.Players.FirstOrDefaultAsync(p => p.Id == playerId);
+        if (player is null) return Phase.Suggest;
+
+        // Auto-upgrade any legacy Reveal phase to Vote to avoid blank screens
+        if (player.CurrentPhase == Phase.Reveal)
+        {
+            player.CurrentPhase = Phase.Vote;
+            await db.SaveChangesAsync();
+        }
+
+        return player.CurrentPhase;
     }
 
     public static IResult PhaseMismatch(Phase required, Phase current) =>