diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index fb41e96f8..e6942577e 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -9,7 +9,7 @@ class Notifier
 
   def generate
     recipients.map do |recipient|
-      Notification.create! user: recipient, creator: event.creator, resource: bubble, body: body
+      Notification.create! user: recipient, creator: event.creator, resource: resource, body: body
     end
   end
 
@@ -27,10 +27,14 @@ class Notifier
     end
 
     def bubble
-      @event.summary.message.bubble
+      event.summary.message.bubble
     end
 
     def creator
-      @event.creator
+      event.creator
+    end
+
+    def resource
+      bubble
     end
 end
diff --git a/app/models/notifier/commented.rb b/app/models/notifier/commented.rb
index d40476de6..02caf607c 100644
--- a/app/models/notifier/commented.rb
+++ b/app/models/notifier/commented.rb
@@ -7,4 +7,8 @@ class Notifier::Commented < Notifier
     def recipients
       bubble.bucket.users.without(creator)
     end
+
+    def resource
+      event.comment
+    end
 end