diff --git a/core/src/test/scala/akka/persistence/jdbc/query/CurrentEventsByTagTest.scala b/core/src/test/scala/akka/persistence/jdbc/query/CurrentEventsByTagTest.scala
index a39f9150..9eb3700d 100644
--- a/core/src/test/scala/akka/persistence/jdbc/query/CurrentEventsByTagTest.scala
+++ b/core/src/test/scala/akka/persistence/jdbc/query/CurrentEventsByTagTest.scala
@@ -182,7 +182,7 @@ abstract class CurrentEventsByTagTest(config: String) extends QueryTestSpec(conf
             if (i > largeNumberOfMessage / 2) {
               Future {
                 latch.await()
-                actor ? TaggedAsyncEvent(Event(i.toString), tag)
+                (actor ? TaggedAsyncEvent(Event(i.toString), tag)) (20.seconds)
               }
             } else {
               actor ? TaggedAsyncEvent(Event(i.toString), tag)