1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/entities/notification_setting.rb b/lib/api/entities/notification_setting.rb
index cdff4f2f5c5..aa6112b4402 100644
--- a/lib/api/entities/notification_setting.rb
+++ b/lib/api/entities/notification_setting.rb
@@ -4,9 +4,9 @@ module API
   module Entities
     class NotificationSetting < Grape::Entity
       expose :level
-      expose :events, if: ->(notification_setting, _) { notification_setting.custom? } do
-        ::NotificationSetting.email_events.each do |event|
-          expose event
+      expose :events, if: ->(notification_setting, _) { notification_setting.custom? } do |setting|
+        setting.email_events.index_with do |event_name|
+          setting[event_name]
         end
       end
     end