diff --git a/core/shared/src/main/scala/canoe/api/sources/Polling.scala b/core/shared/src/main/scala/canoe/api/sources/Polling.scala
index b845a700..11a66dd0 100644
--- a/core/shared/src/main/scala/canoe/api/sources/Polling.scala
+++ b/core/shared/src/main/scala/canoe/api/sources/Polling.scala
@@ -29,10 +29,7 @@ private[api] class Polling[F[_]: TelegramClient: Functor](timeout: FiniteDuratio
       .map(updates => (lastId(updates).map(_ + 1).getOrElse(offset), updates))
 
   private def lastId(updates: List[Update]): Option[Long] =
-    updates match {
-      case Nil      => None
-      case nonEmpty => Some(nonEmpty.map(_.updateId).max)
-    }
+    updates.lastOption.map(_.updateId)
 }
 
 object Polling {