diff --git a/web/push-notif/push-notifs-handler.js b/web/push-notif/push-notifs-handler.js
--- a/web/push-notif/push-notifs-handler.js
+++ b/web/push-notif/push-notifs-handler.js
@@ -166,6 +166,10 @@
     state => state.alertStore.alertInfos[alertTypes.NOTIF_PERMISSION],
   );
 
+  const tunnelbrokerDeviceToken = useSelector(
+    state => state.tunnelbrokerDeviceToken,
+  );
+
   const modalContext = useModalContext();
   const loggedIn = useSelector(isLoggedIn);
 
@@ -173,6 +177,12 @@
 
   const supported = 'Notification' in window && !electron;
 
+  React.useEffect(() => {
+    if (!tunnelbrokerDeviceToken.localToken) {
+      void createPushSubscription();
+    }
+  }, [createPushSubscription, tunnelbrokerDeviceToken.localToken]);
+
   React.useEffect(() => {
     void (async () => {
       if (!navigator.serviceWorker || !supported) {