diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 653075b37..7589855cc 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -521,8 +521,14 @@ function sendDeliveryReceipt(source: string, timestamp: any) {
   // await getMessageQueue().sendUsingMultiDevice(device, receiptMessage);
 }
 
+interface MessageEvent {
+  data: any;
+  type: string;
+  confirm: () => void;
+}
+
 // tslint:disable:cyclomatic-complexity max-func-body-length */
-export async function handleMessageEvent(event: any): Promise<void> {
+export async function handleMessageEvent(event: MessageEvent): Promise<void> {
   const { data, confirm } = event;
 
   const isIncoming = event.type === 'message';
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 3b50cdb93..f5fe2c92f 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -325,6 +325,9 @@ export async function handleUnencryptedMessage({ message: outerMessage }: any) {
     // Public chat messages from ourselves should be outgoing
     type: isPublicChatMessage && isOurDevice ? 'sent' : 'message',
     data: outerMessage,
+    confirm: () => {
+      /* do nothing */
+    },
   };
 
   await handleMessageEvent(ev);
diff --git a/ts/session/onions/index.ts b/ts/session/onions/index.ts
index 5f875fae7..53a2c1cd4 100644
--- a/ts/session/onions/index.ts
+++ b/ts/session/onions/index.ts
@@ -218,7 +218,7 @@ class OnionPaths {
 
     log.info('new guard nodes: ', guardNodes);
 
-    const edKeys = guardNodes.map(n => _.pick(n, 'pubkey_ed25519'));
+    const edKeys = guardNodes.map(n => n.pubkey_ed25519);
 
     await window.libloki.storage.updateGuardNodes(edKeys);