diff --git a/packages/snjs/lib/Services/Api/WebsocketsService.ts b/packages/snjs/lib/Services/Api/WebsocketsService.ts
index 93a761ddd..3a8fa7788 100644
--- a/packages/snjs/lib/Services/Api/WebsocketsService.ts
+++ b/packages/snjs/lib/Services/Api/WebsocketsService.ts
@@ -38,19 +38,21 @@ export class SNWebSocketsService extends AbstractService<WebSocketsServiceEvent,
   }
 
   async startWebSocketConnection(): Promise<void> {
+    if (!this.webSocketUrl) {
+      return
+    }
+
     const webSocketConectionToken = await this.createWebSocketConnectionToken()
     if (webSocketConectionToken === undefined) {
       return
     }
 
-    if (this.webSocketUrl) {
-      try {
-        this.webSocket = new WebSocket(`${this.webSocketUrl}?authToken=${webSocketConectionToken}`)
-        this.webSocket.onmessage = this.onWebSocketMessage.bind(this)
-        this.webSocket.onclose = this.onWebSocketClose.bind(this)
-      } catch (e) {
-        console.error('Error starting WebSocket connection', e)
-      }
+    try {
+      this.webSocket = new WebSocket(`${this.webSocketUrl}?authToken=${webSocketConectionToken}`)
+      this.webSocket.onmessage = this.onWebSocketMessage.bind(this)
+      this.webSocket.onclose = this.onWebSocketClose.bind(this)
+    } catch (e) {
+      console.error('Error starting WebSocket connection', e)
     }
   }
 
diff --git a/packages/snjs/mocha/files.test.js b/packages/snjs/mocha/files.test.js
index fb7f6be23..5afdc5208 100644
--- a/packages/snjs/mocha/files.test.js
+++ b/packages/snjs/mocha/files.test.js
@@ -44,6 +44,13 @@ describe('files', function () {
         subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
         timestamp: Date.now(),
         offline: false,
+        discountCode: null,
+        limitedDiscountPurchased: false,
+        newSubscriber: true,
+        totalActiveSubscriptionsCount: 1,
+        userRegisteredAt: 1,
+        billingFrequency: 12,
+        payAmount: 59.00
       })
       await Factory.sleep(0.25)
     }
@@ -81,6 +88,13 @@ describe('files', function () {
       subscriptionExpiresAt: (new Date().getTime() - 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
 
     await Factory.sleep(0.25)
diff --git a/packages/snjs/mocha/settings.test.js b/packages/snjs/mocha/settings.test.js
index f05e8b56e..431b9f4b4 100644
--- a/packages/snjs/mocha/settings.test.js
+++ b/packages/snjs/mocha/settings.test.js
@@ -124,6 +124,13 @@ describe('settings service', function () {
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
 
     await Factory.sleep(1)
@@ -142,6 +149,13 @@ describe('settings service', function () {
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(1)
 
@@ -164,13 +178,16 @@ describe('settings service', function () {
     const usedSettingBefore = await application.settings.getSubscriptionSetting('FILE_UPLOAD_BYTES_USED')
     expect(usedSettingBefore).to.equal('123')
 
-
     await Factory.publishMockedEvent('SUBSCRIPTION_EXPIRED', {
       userEmail: context.email,
       subscriptionId: 1,
       subscriptionName: 'PRO_PLAN',
       timestamp: Date.now(),
       offline: false,
+      totalActiveSubscriptionsCount: 1,
+      userExistingSubscriptionsCount: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(1)
 
@@ -181,6 +198,13 @@ describe('settings service', function () {
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: false,
+      totalActiveSubscriptionsCount: 2,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(1)
 
diff --git a/packages/snjs/mocha/subscriptions.test.js b/packages/snjs/mocha/subscriptions.test.js
index 2e91e2694..0adb08b99 100644
--- a/packages/snjs/mocha/subscriptions.test.js
+++ b/packages/snjs/mocha/subscriptions.test.js
@@ -37,6 +37,13 @@ describe('subscriptions', function () {
       subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000,
       timestamp: Date.now(),
       offline: false,
+      discountCode: null,
+      limitedDiscountPurchased: false,
+      newSubscriber: true,
+      totalActiveSubscriptionsCount: 1,
+      userRegisteredAt: 1,
+      billingFrequency: 12,
+      payAmount: 59.00
     })
     await Factory.sleep(0.25)
   })