diff --git a/modules/api/src/main/GameApiV2.scala b/modules/api/src/main/GameApiV2.scala
index a09ddac674..82e215f354 100644
--- a/modules/api/src/main/GameApiV2.scala
+++ b/modules/api/src/main/GameApiV2.scala
@@ -102,7 +102,7 @@ final class GameApiV2(
       .mapConcat(_ filter config.postFilter)
       .take(config.max | Int.MaxValue)
       .via(preparationFlow(config))
-      .merge(Source.tick(keepAliveInterval, keepAliveInterval, emptyMsgFor(config)))
+      .keepAlive(keepAliveInterval, () => emptyMsgFor(config))
 
   def exportByIds(config: ByIdsConfig): Source[String, _] =
     gameRepo