diff --git a/validator/eventadapter/src/main/java/tech/pegasys/teku/validator/eventadapter/EventChannelBeaconChainEventAdapter.java b/validator/eventadapter/src/main/java/tech/pegasys/teku/validator/eventadapter/EventChannelBeaconChainEventAdapter.java
index c4f36811fa3..cf6c2dd4846 100644
--- a/validator/eventadapter/src/main/java/tech/pegasys/teku/validator/eventadapter/EventChannelBeaconChainEventAdapter.java
+++ b/validator/eventadapter/src/main/java/tech/pegasys/teku/validator/eventadapter/EventChannelBeaconChainEventAdapter.java
@@ -49,12 +49,12 @@ public SafeFuture<Void> start() {
         .subscribe(SlotEventsChannel.class, this)
         .subscribe(ReorgEventChannel.class, this);
 
-    return SafeFuture.completedFuture(null);
+    return SafeFuture.COMPLETE;
   }
 
   @Override
   public SafeFuture<Void> stop() {
-    return SafeFuture.completedFuture(null);
+    return SafeFuture.COMPLETE;
   }
 
   @Subscribe