--- a/LibUnitTracker/displayName/modules/Notification.lua
+++ b/LibUnitTracker/displayName/modules/Notification.lua
@@ -9,22 +9,38 @@
 end
 
 function class:eventHandlers()
-    EVENT_MANAGER:RegisterForEvent(self.name, EVENT_RAID_SCORE_NOTIFICATION_ADDED, function(eventCode, notificationId)
+    EVENT_MANAGER:RegisterForEvent(self.name, EVENT_LEADERBOARD_SCORE_NOTIFICATION_ADDED, function(eventCode, notificationId)
         self:scan(notificationId)
     end)
 end
 
+-- Returns the number of members for a leaderboard-score notification, or 0 if
+-- the current API surface does not expose the count (feature quietly disabled).
+local function getNotificationMemberCount(notificationId)
+    if type(GetLeaderboardScoreNotificationInfo) ~= "function" then
+        return 0
+    end
+    -- GetLeaderboardScoreNotificationInfo returns notification details including
+    -- the number of members; grab the numeric field defensively.
+    local results = { GetLeaderboardScoreNotificationInfo(notificationId) }
+    for _, value in ipairs(results) do
+        if type(value) == "number" then
+            return value
+        end
+    end
+    return 0
+end
+
 function class:scan(notificationId)
-    for memberIndex = 1, GetNumRaidScoreNotificationMembers(notificationId) do
-        local displayName, characterName, _, _, _ = GetRaidScoreNotificationMemberInfo(notificationId, memberIndex)
+    for memberIndex = 1, getNotificationMemberCount(notificationId) do
+        local displayName, characterName, _, _, _ = GetLeaderboardScoreNotificationMemberInfo(notificationId, memberIndex)
         self.owner:AddDisplayName(characterName, displayName)
     end
 end
 
 function class:scanNotification(notificationId)
-    for memberIndex = 1, GetNumRaidScoreNotificationMembers(notificationId) do
-        local displayName, characterName, _, _, _ = GetRaidScoreNotificationMemberInfo(notificationId, memberIndex)
+    for memberIndex = 1, getNotificationMemberCount(notificationId) do
+        local displayName, characterName, _, _, _ = GetLeaderboardScoreNotificationMemberInfo(notificationId, memberIndex)
         self.owner:AddDisplayName(characterName, displayName)
     end
 end
-