diff --git a/src/renderer/utils/notifications/handlers/discussion.ts b/src/renderer/utils/notifications/handlers/discussion.ts
index a7f5669fb..4ff2f8c92 100644
--- a/src/renderer/utils/notifications/handlers/discussion.ts
+++ b/src/renderer/utils/notifications/handlers/discussion.ts
@@ -94,7 +94,7 @@ class DiscussionHandler extends DefaultHandler {
   }
 
   defaultUrl(notification: GitifyNotification): Link {
-    const url = new URL(notification.repository.htmlUrl);
+    const url = new URL(defaultHandler.defaultUrl(notification));
     url.pathname += '/discussions';
     return url.href as Link;
   }
diff --git a/src/renderer/utils/notifications/handlers/issue.ts b/src/renderer/utils/notifications/handlers/issue.ts
index 680fb99b0..452bf6e41 100644
--- a/src/renderer/utils/notifications/handlers/issue.ts
+++ b/src/renderer/utils/notifications/handlers/issue.ts
@@ -85,7 +85,7 @@ class IssueHandler extends DefaultHandler {
   }
 
   defaultUrl(notification: GitifyNotification): Link {
-    const url = new URL(notification.repository.htmlUrl);
+    const url = new URL(defaultHandler.defaultUrl(notification));
     url.pathname += '/issues';
     return url.href as Link;
   }
diff --git a/src/renderer/utils/notifications/handlers/pullRequest.ts b/src/renderer/utils/notifications/handlers/pullRequest.ts
index 290255a1b..e1245039f 100644
--- a/src/renderer/utils/notifications/handlers/pullRequest.ts
+++ b/src/renderer/utils/notifications/handlers/pullRequest.ts
@@ -99,7 +99,7 @@ class PullRequestHandler extends DefaultHandler {
   }
 
   defaultUrl(notification: GitifyNotification): Link {
-    const url = new URL(notification.repository.htmlUrl);
+    const url = new URL(defaultHandler.defaultUrl(notification));
     url.pathname += '/pulls';
     return url.href as Link;
   }
diff --git a/src/renderer/utils/notifications/handlers/release.ts b/src/renderer/utils/notifications/handlers/release.ts
index 5c70c50d0..d42650eee 100644
--- a/src/renderer/utils/notifications/handlers/release.ts
+++ b/src/renderer/utils/notifications/handlers/release.ts
@@ -13,7 +13,7 @@ import type {
 } from '../../../types';
 import { getRelease } from '../../api/client';
 import { isStateFilteredOut } from '../filters/filter';
-import { DefaultHandler } from './default';
+import { DefaultHandler, defaultHandler } from './default';
 import { getNotificationAuthor } from './utils';
 
 class ReleaseHandler extends DefaultHandler {
@@ -54,7 +54,7 @@ class ReleaseHandler extends DefaultHandler {
   }
 
   defaultUrl(notification: GitifyNotification): Link {
-    const url = new URL(notification.repository.htmlUrl);
+    const url = new URL(defaultHandler.defaultUrl(notification));
     url.pathname += '/releases';
     return url.href as Link;
   }
diff --git a/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.ts b/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.ts
index 5616399c7..affe9f48c 100644
--- a/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.ts
+++ b/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.ts
@@ -4,7 +4,7 @@ import type { OcticonProps } from '@primer/octicons-react';
 import { AlertIcon } from '@primer/octicons-react';
 
 import type { GitifyNotification, GitifySubject, Link } from '../../../types';
-import { DefaultHandler } from './default';
+import { DefaultHandler, defaultHandler } from './default';
 
 class RepositoryDependabotAlertsThreadHandler extends DefaultHandler {
   readonly type = 'RepositoryDependabotAlertsThread';
@@ -14,7 +14,7 @@ class RepositoryDependabotAlertsThreadHandler extends DefaultHandler {
   }
 
   defaultUrl(notification: GitifyNotification): Link {
-    const url = new URL(notification.repository.htmlUrl);
+    const url = new URL(defaultHandler.defaultUrl(notification));
     url.pathname += '/security/dependabot';
     return url.href as Link;
   }
diff --git a/src/renderer/utils/notifications/handlers/repositoryInvitation.ts b/src/renderer/utils/notifications/handlers/repositoryInvitation.ts
index 82d01c044..73b5291c0 100644
--- a/src/renderer/utils/notifications/handlers/repositoryInvitation.ts
+++ b/src/renderer/utils/notifications/handlers/repositoryInvitation.ts
@@ -3,7 +3,7 @@ import type { FC } from 'react';
 import { MailIcon, type OcticonProps } from '@primer/octicons-react';
 
 import type { GitifyNotification, GitifySubject, Link } from '../../../types';
-import { DefaultHandler } from './default';
+import { DefaultHandler, defaultHandler } from './default';
 
 class RepositoryInvitationHandler extends DefaultHandler {
   readonly type = 'RepositoryInvitation';
@@ -13,7 +13,7 @@ class RepositoryInvitationHandler extends DefaultHandler {
   }
 
   defaultUrl(notification: GitifyNotification): Link {
-    const url = new URL(notification.repository.htmlUrl);
+    const url = new URL(defaultHandler.defaultUrl(notification));
     url.pathname += '/invitations';
     return url.href as Link;
   }