diff --git a/modules/game/src/main/Query.scala b/modules/game/src/main/Query.scala
index a46cded2d40f..14d08cc7142f 100644
--- a/modules/game/src/main/Query.scala
+++ b/modules/game/src/main/Query.scala
@@ -26,7 +26,10 @@ object Query:
 
   val mate: Bdoc = status(Status.Mate)
 
-  def draw(u: UserId): Bdoc = user(u) ++ finished ++ F.winnerId.$exists(false)
+  def draw(u: UserId): Bdoc =
+    user(u) ++ F.winnerId.$exists(false) ++ $doc(
+      F.status $in List(Status.Stalemate.id, Status.Draw.id)
+    )
 
   val finished: Bdoc = F.status $gte Status.Mate.id