diff --git a/app/models/bubble.rb b/app/models/bubble.rb
index 7b4856aa1..b23cd48f2 100644
--- a/app/models/bubble.rb
+++ b/app/models/bubble.rb
@@ -1,6 +1,5 @@
 class Bubble < ApplicationRecord
-  include Assignable, Boostable, Colored, Messages, Poppable, Searchable, Staged, Taggable
-  include Commentable, Eventable # depend on Messages
+  include Assignable, Boostable, Colored, Commentable, Eventable, Messages, Poppable, Searchable, Staged, Taggable
 
   belongs_to :bucket
   belongs_to :creator, class_name: "User", default: -> { Current.user }