diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
index 96e4093..8a947da 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
@@ -180,7 +180,7 @@
     try {
       try {
         while (count.get() == 0 || isTaken()) {
-          readyForTake.await();
+          readyForTake.await(5, TimeUnit.SECONDS);
         }
       } catch (InterruptedException e) {
         signalReadyForTake();