diff --git a/public/sw/push.js b/public/sw/push.js
index d492c30..c6a2197 100644
--- a/public/sw/push.js
+++ b/public/sw/push.js
@@ -23,14 +23,13 @@ self.addEventListener("notificationclick", function (event) {
   const clickedNotification = event.notification;
   clickedNotification.close();
 
-  if (event.action == "open" && event.data.id) {
+  if (event.action == "open" && event.data?.id) {
     const promiseChain = clients.openWindow(
       BASE_URL + "/colles/" + event.data.id
     );
     event.waitUntil(promiseChain);
-    return;
+  } else {
+    const promiseChain = clients.openWindow(BASE_URL);
+    event.waitUntil(promiseChain);
   }
-
-  const promiseChain = clients.openWindow(BASE_URL);
-  event.waitUntil(promiseChain);
 });