diff --git a/src/components/serviceworker/notifications.js b/src/components/serviceworker/notifications.js
index 339d521bbc..9b50553244 100644
--- a/src/components/serviceworker/notifications.js
+++ b/src/components/serviceworker/notifications.js
@@ -26,7 +26,8 @@
         });
     }
 
-    window.addEventListener('notificationclick', function (event) {
+    /* eslint-disable-next-line no-restricted-globals -- self is valid in a serviceworker environment */
+    self.addEventListener('notificationclick', function (event) {
         var notification = event.notification;
         notification.close();
 
diff --git a/src/scripts/apploader.js b/src/scripts/apploader.js
index f5f6850c40..fdf52fd699 100644
--- a/src/scripts/apploader.js
+++ b/src/scripts/apploader.js
@@ -35,7 +35,8 @@
         // Promise() being missing on some legacy browser, and a funky one
         // is Promise() present but buggy on WebOS 2
         window.Promise = undefined;
-        window.Promise = undefined;
+        /* eslint-disable-next-line no-restricted-globals -- Explicit check on self needed */
+        self.Promise = undefined;
     }
 
     if (!window.Promise) {