diff --git a/ts/session/protocols/SessionProtocol.ts b/ts/session/protocols/SessionProtocol.ts
index acd21dab4..1709d8ffd 100644
--- a/ts/session/protocols/SessionProtocol.ts
+++ b/ts/session/protocols/SessionProtocol.ts
@@ -239,7 +239,7 @@ export class SessionProtocol {
   ): Promise<void> {
     await SessionProtocol.fetchFromDBIfNeeded();
     if (
-      SessionProtocol.updateSessionTimestamp(
+      await SessionProtocol.updateSessionTimestamp(
         device,
         timestamp,
         SessionProtocol.sentSessionsTimestamp
@@ -258,7 +258,7 @@ export class SessionProtocol {
   ): Promise<void> {
     await SessionProtocol.fetchFromDBIfNeeded();
     if (
-      SessionProtocol.updateSessionTimestamp(
+      await SessionProtocol.updateSessionTimestamp(
         device,
         timestamp,
         SessionProtocol.processedSessionsTimestamp
diff --git a/ts/session/sending/MessageQueue.ts b/ts/session/sending/MessageQueue.ts
index 51747f784..5ded99a5c 100644
--- a/ts/session/sending/MessageQueue.ts
+++ b/ts/session/sending/MessageQueue.ts
@@ -49,7 +49,7 @@ export class MessageQueue implements MessageQueueInterface {
     let currentDevices = [...devices];
 
     // Sync to our devices if syncable
-    if (SyncMessageUtils.canSync(message)) {
+    if (await SyncMessageUtils.canSync(message)) {
       const currentDevice = await UserUtil.getCurrentDevicePubKey();
 
       if (currentDevice) {
diff --git a/ts/session/utils/JobQueue.ts b/ts/session/utils/JobQueue.ts
index fa5082836..7293e8fe7 100644
--- a/ts/session/utils/JobQueue.ts
+++ b/ts/session/utils/JobQueue.ts
@@ -25,6 +25,7 @@ export class JobQueue {
       return this.jobs.get(id) as Promise<Result>;
     }
 
+    // tslint:disable-next-line: no-promise-as-boolean
     const previous = this.pending || Promise.resolve();
     this.pending = previous.then(job, job);