diff --git a/sw.js b/sw.js
index 99d6f76..6ce668e 100644
--- a/sw.js
+++ b/sw.js
@@ -4,18 +4,17 @@ const ORIGIN = self.location.origin;
 
 self.addEventListener('install', e => {
     e.waitUntil(
-        caches.open(CACHE).then(c => c.addAll(ASSETS))
+        caches.open(CACHE).then(c => c.addAll(ASSETS)).then(() => self.skipWaiting())
     );
-    self.skipWaiting();
 });
 
 self.addEventListener('activate', e => {
     e.waitUntil(
         caches.keys().then(keys =>
             Promise.all(keys.filter(k => k !== CACHE).map(k => caches.delete(k)))
-        ).catch(err => console.warn('[SW] activate error', err))
+        ).then(() => self.clients.claim())
+        .catch(err => console.warn('[SW] activate error', err))
     );
-    self.clients.claim();
 });
 
 self.addEventListener('fetch', e => {