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 259b080..841aa4f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
@@ -92,7 +92,7 @@
       idLookupLock.lock();
       try {
         if (!force && getExistingId(key, true).isPresent()) {
-          logger.atWarning().log("Event %s is already pushed.", key);
+          logger.atFine().log("Event %s is already pushed.", key);
           return;
         }
         synchronized (eventQueueLock) {
@@ -131,7 +131,7 @@
       if (fromHub != null) {
         if (key.matches(fromHub)) {
           if (expectingAbsent) {
-            logger.atWarning().log(
+            logger.atFine().log(
                 "Unexpected event found in queue: %s, with id: %s", key, fromHub.meta.id);
           }
           return Optional.of(fromHub.meta.id);
@@ -141,7 +141,7 @@
       }
       Optional<UUID> fromCache = idCache.getEventId(key);
       if (fromCache.isPresent() && expectingAbsent) {
-        logger.atWarning().log("Got unexpected event-id from cache: %s", fromCache.get());
+        logger.atFine().log("Got unexpected event-id from cache: %s", fromCache.get());
       }
       return fromCache;
     } finally {
