diff --git a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
index 828ae4a..8ea3580 100644
--- a/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
+++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationService.kt
@@ -71,9 +71,8 @@ class NotificationService(val context: Context) {
     fun createSubscriptionNotificationChannels(subscription: Subscription) {
         val notificationScope = dedicatedNotificationScope(subscription)
         val groupId = dedicatedGroupId(subscription)
-        val displayName = displayName(subscription)
 
-        maybeCreateNotificationGroup(groupId, displayName)
+        maybeCreateNotificationGroup(groupId, subscriptionTopicShortUrl(subscription))
 
         (1..5).forEach { priority -> maybeCreateNotificationChannel(notificationScope, priority, groupId) }
     }
@@ -116,7 +115,7 @@ class NotificationService(val context: Context) {
         maybeAddUserActions(builder, notification)
 
         if (groupId != null) {
-            maybeCreateNotificationGroup(groupId, displayName(subscription))
+            maybeCreateNotificationGroup(groupId, subscriptionTopicShortUrl(subscription))
         }
 
         maybeCreateNotificationChannel(scope, notification.priority, groupId)
diff --git a/app/src/main/java/io/heckel/ntfy/util/Util.kt b/app/src/main/java/io/heckel/ntfy/util/Util.kt
index d987e41..bd57516 100644
--- a/app/src/main/java/io/heckel/ntfy/util/Util.kt
+++ b/app/src/main/java/io/heckel/ntfy/util/Util.kt
@@ -56,8 +56,12 @@ fun topicUrlAuth(baseUrl: String, topic: String) = "${topicUrl(baseUrl, topic)}/
 fun topicUrlJsonPoll(baseUrl: String, topic: String, since: String) = "${topicUrl(baseUrl, topic)}/json?poll=1&since=$since"
 fun topicShortUrl(baseUrl: String, topic: String) = shortUrl(topicUrl(baseUrl, topic))
 
+fun subscriptionTopicShortUrl(subscription: Subscription) : String {
+    return topicShortUrl(subscription.baseUrl, subscription.topic)
+}
+
 fun displayName(subscription: Subscription) : String {
-    return subscription.displayName ?: topicShortUrl(subscription.baseUrl, subscription.topic)
+    return subscription.displayName ?: subscriptionTopicShortUrl(subscription)
 }
 
 fun shortUrl(url: String) = url