diff --git a/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt b/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
index ea9d5c735..e3bb602cf 100644
--- a/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
+++ b/briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
@@ -81,9 +81,9 @@ constructor(
 
     override fun eventOccurred(e: Event) {
         when (e) {
-            is ConversationMessageReceivedEvent<*> -> dbExecutor.execute {
+            is ConversationMessageReceivedEvent<*> -> {
                 val h = e.messageHeader
-                if (h is PrivateMessageHeader) {
+                if (h is PrivateMessageHeader) dbExecutor.execute {
                     val text = messagingManager.getMessageText(h.id)
                     webSocketController.sendEvent(EVENT_CONVERSATION_MESSAGE, e.output(text))
                 } else {
diff --git a/briar-headless/src/test/java/org/briarproject/briar/headless/event/WebSocketControllerTest.kt b/briar-headless/src/test/java/org/briarproject/briar/headless/event/WebSocketControllerTest.kt
index 8d7d6d407..63aad8748 100644
--- a/briar-headless/src/test/java/org/briarproject/briar/headless/event/WebSocketControllerTest.kt
+++ b/briar-headless/src/test/java/org/briarproject/briar/headless/event/WebSocketControllerTest.kt
@@ -69,8 +69,6 @@ internal class WebSocketControllerTest : ControllerTest() {
 
     @Test
     fun testIntroductionRequestEvent() {
-        val sessionId = SessionId(getRandomId())
-        val authorInfo = AuthorInfo(VERIFIED)
         val introductionRequest = IntroductionRequest(
             message.id,
             group.id,
@@ -79,11 +77,11 @@ internal class WebSocketControllerTest : ControllerTest() {
             true,
             true,
             true,
-            sessionId,
+            SessionId(getRandomId()),
             author,
             text,
             false,
-            authorInfo
+            AuthorInfo(VERIFIED)
         )
         val introductionRequestEvent =
             IntroductionRequestReceivedEvent(introductionRequest, contact.id)