diff --git a/modules/store/src/main/scala/de/nowchess/store/redis/GameWritebackStreamListener.scala b/modules/store/src/main/scala/de/nowchess/store/redis/GameWritebackStreamListener.scala
index 519ae2d..1bce103 100644
--- a/modules/store/src/main/scala/de/nowchess/store/redis/GameWritebackStreamListener.scala
+++ b/modules/store/src/main/scala/de/nowchess/store/redis/GameWritebackStreamListener.scala
@@ -61,7 +61,7 @@ class GameWritebackStreamListener:
           ">",
           new XReadGroupArgs().count(10).block(java.time.Duration.ofSeconds(2)),
         )
-        if messages != null then messages.forEach(msg => handleMessage(msg))
+        Option(messages).foreach(_.forEach(msg => handleMessage(msg)))
       } match
         case Failure(ex) => log.warnf(ex, "Error in writeback poll loop")
         case Success(_)  => ()