diff --git a/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java
index 150852114..4b1bd20af 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/event/EventBusImpl.java
@@ -2,6 +2,7 @@ package org.briarproject.bramble.event;
 
 import org.briarproject.bramble.api.event.Event;
 import org.briarproject.bramble.api.event.EventBus;
+import org.briarproject.bramble.api.event.EventExecutor;
 import org.briarproject.bramble.api.event.EventListener;
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 
@@ -10,6 +11,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executor;
 
 import javax.annotation.concurrent.ThreadSafe;
+import javax.inject.Inject;
 
 @ThreadSafe
 @NotNullByDefault
@@ -19,7 +21,8 @@ class EventBusImpl implements EventBus {
 			new CopyOnWriteArrayList<>();
 	private final Executor eventExecutor;
 
-	EventBusImpl(Executor eventExecutor) {
+	@Inject
+	EventBusImpl(@EventExecutor Executor eventExecutor) {
 		this.eventExecutor = eventExecutor;
 	}
 
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/event/EventModule.java b/bramble-core/src/main/java/org/briarproject/bramble/event/EventModule.java
index 8aa1fea06..f40dbe561 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/event/EventModule.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/event/EventModule.java
@@ -1,9 +1,6 @@
 package org.briarproject.bramble.event;
 
 import org.briarproject.bramble.api.event.EventBus;
-import org.briarproject.bramble.api.event.EventExecutor;
-
-import java.util.concurrent.Executor;
 
 import javax.inject.Singleton;
 
@@ -15,7 +12,7 @@ public class EventModule {
 
 	@Provides
 	@Singleton
-	EventBus provideEventBus(@EventExecutor Executor eventExecutor) {
-		return new EventBusImpl(eventExecutor);
+	EventBus provideEventBus(EventBusImpl eventBus) {
+		return eventBus;
 	}
 }
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt
index dedf355de..f349de62b 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/BriarHeadlessTestApp.kt
@@ -4,6 +4,7 @@ import dagger.Component
 import org.briarproject.bramble.BrambleCoreEagerSingletons
 import org.briarproject.bramble.BrambleCoreModule
 import org.briarproject.bramble.account.AccountModule
+import org.briarproject.bramble.event.DefaultEventExecutorModule
 import org.briarproject.bramble.test.TestSecureRandomModule
 import org.briarproject.briar.BriarCoreEagerSingletons
 import org.briarproject.briar.BriarCoreModule
@@ -16,6 +17,7 @@ import javax.inject.Singleton
         BriarCoreModule::class,
         TestSecureRandomModule::class,
         AccountModule::class,
+        DefaultEventExecutorModule::class,
         HeadlessTestModule::class
     ]
 )