diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/Dispatcher.scala b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/Dispatcher.scala
index 44441099..5558ef39 100644
--- a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/Dispatcher.scala
+++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/Dispatcher.scala
@@ -56,7 +56,7 @@ object Dispatcher {
     maxParallelism: Int = 1,
     updateBatch: Chunk[Record] => URIO[GreyhoundMetrics, Unit] = _ => ZIO.unit,
     currentGaps: Set[TopicPartition] => ZIO[GreyhoundMetrics, Nothing, Map[TopicPartition, OffsetAndGaps]] = _ => ZIO.succeed(Map.empty),
-    gapsSizeLimit: Int = 256,
+    gapsSizeLimit: Int = 500,
     init: Promise[Nothing, Unit]
   )(implicit trace: Trace): UIO[Dispatcher[R]] =
     for {
diff --git a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/EventLoop.scala b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/EventLoop.scala
index afe474a5..d5aaa3b5 100644
--- a/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/EventLoop.scala
+++ b/core/src/main/scala/com/wixpress/dst/greyhound/core/consumer/EventLoop.scala
@@ -412,7 +412,7 @@ object EventLoopConfig {
     startPaused = false,
     consumePartitionInParallel = false,
     maxParallelism = 1,
-    gapsSizeLimit = 256 // todo: calculate actual gaps limit based on the max metadata size
+    gapsSizeLimit = 500
   )
 }