diff --git a/sw/eventListener.js b/sw/eventListener.js
index fab3e910a..0e8b6778e 100644
--- a/sw/eventListener.js
+++ b/sw/eventListener.js
@@ -236,7 +236,7 @@ export function onMessage (sw) {
       messageChannelPort = event.ports[0]
     }
     log('[sw:message] received message', 'info', { action: event.data.action })
-    const currentOS = await getOS()
+    const currentOS = event.waitUntil(getOS())
     log('[sw:message] stored os: ' + currentOS, 'info', { action: event.data.action })
     if (event.data.action === STORE_SUBSCRIPTION) {
       log('[sw:message] storing subscription in IndexedDB', 'info', { endpoint: event.data.subscription.endpoint })
@@ -253,8 +253,8 @@ export function onMessage (sw) {
       promises.push(sw.registration.getNotifications().then((notifications) => {
         notifications.forEach(notification => notification.close())
       }))
-      activeCount = 0
       promises.push(clearAppBadge(sw))
+      activeCount = 0
       event.waitUntil(Promise.all(promises))
     }
   }