diff --git a/app/models/bubble/draftable.rb b/app/models/bubble/draftable.rb
index 0a42856e6..5afc21d06 100644
--- a/app/models/bubble/draftable.rb
+++ b/app/models/bubble/draftable.rb
@@ -11,6 +11,10 @@ module Bubble::Draftable
     transaction do
       published!
       track_event :published
+
+      if assignments.any?
+        track_event :assigned, assignee_ids: assignee_ids
+      end
     end
   end
 end
diff --git a/app/models/bubble/eventable.rb b/app/models/bubble/eventable.rb
index 927ac1f25..e2676d904 100644
--- a/app/models/bubble/eventable.rb
+++ b/app/models/bubble/eventable.rb
@@ -7,8 +7,10 @@ module Bubble::Eventable
 
   private
     def track_event(action, creator: Current.user, **particulars)
-      event = find_or_capture_event_summary.events.create! action: action, creator: creator, bubble: self, particulars: particulars
-      event.generate_notifications_later
+      if published?
+        event = find_or_capture_event_summary.events.create! action: action, creator: creator, bubble: self, particulars: particulars
+        event.generate_notifications_later
+      end
     end
 
     def find_or_capture_event_summary