diff --git a/app/controllers/assignments_controller.rb b/app/controllers/assignments_controller.rb
index 554d86850..eb9c4e74f 100644
--- a/app/controllers/assignments_controller.rb
+++ b/app/controllers/assignments_controller.rb
@@ -1,5 +1,5 @@
 class AssignmentsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def new
     render partial: "bubbles/assignment", locals: { bubble: @bubble }
diff --git a/app/controllers/boosts_controller.rb b/app/controllers/boosts_controller.rb
index 0a6f34f78..48400cc10 100644
--- a/app/controllers/boosts_controller.rb
+++ b/app/controllers/boosts_controller.rb
@@ -1,5 +1,5 @@
 class BoostsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     count = if params[:boost_count].to_i == @bubble.boosts_count
diff --git a/app/controllers/bubbles/engagements_controller.rb b/app/controllers/bubbles/engagements_controller.rb
index e13d6679c..5599b7381 100644
--- a/app/controllers/bubbles/engagements_controller.rb
+++ b/app/controllers/bubbles/engagements_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::EngagementsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     @bubble.engage
diff --git a/app/controllers/bubbles/images_controller.rb b/app/controllers/bubbles/images_controller.rb
index 005eb967d..b7dc7da97 100644
--- a/app/controllers/bubbles/images_controller.rb
+++ b/app/controllers/bubbles/images_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::ImagesController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def destroy
     @bubble.image.purge_later
diff --git a/app/controllers/bubbles/pins_controller.rb b/app/controllers/bubbles/pins_controller.rb
index d93eba759..fda94c937 100644
--- a/app/controllers/bubbles/pins_controller.rb
+++ b/app/controllers/bubbles/pins_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::PinsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def show
   end
diff --git a/app/controllers/bubbles/pops_controller.rb b/app/controllers/bubbles/pops_controller.rb
index 395f241e2..5421428ca 100644
--- a/app/controllers/bubbles/pops_controller.rb
+++ b/app/controllers/bubbles/pops_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::PopsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     @bubble.pop!(user: Current.user, reason: params[:reason])
diff --git a/app/controllers/bubbles/publishes_controller.rb b/app/controllers/bubbles/publishes_controller.rb
index 8064e7c68..bcc75eb27 100644
--- a/app/controllers/bubbles/publishes_controller.rb
+++ b/app/controllers/bubbles/publishes_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::PublishesController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     @bubble.publish
diff --git a/app/controllers/bubbles/recovers_controller.rb b/app/controllers/bubbles/recovers_controller.rb
index 530592762..c94fd6ccf 100644
--- a/app/controllers/bubbles/recovers_controller.rb
+++ b/app/controllers/bubbles/recovers_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::RecoversController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     redirect_to @bubble.recover_abandoned_creation
diff --git a/app/controllers/bubbles/stagings_controller.rb b/app/controllers/bubbles/stagings_controller.rb
index 2f2ea68cc..28f7af26e 100644
--- a/app/controllers/bubbles/stagings_controller.rb
+++ b/app/controllers/bubbles/stagings_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::StagingsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     if params[:stage_id].present?
diff --git a/app/controllers/bubbles/watches_controller.rb b/app/controllers/bubbles/watches_controller.rb
index cecd292b5..221f51405 100644
--- a/app/controllers/bubbles/watches_controller.rb
+++ b/app/controllers/bubbles/watches_controller.rb
@@ -1,5 +1,5 @@
 class Bubbles::WatchesController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     set_watching_and_redirect(true)
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index d8b0231ac..4708af0e1 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
   before_action :set_comment, only: [ :show, :edit, :update, :destroy ]
   before_action :require_own_comment, only: [ :edit, :update, :destroy ]
 
diff --git a/app/controllers/concerns/bubble_scoped.rb b/app/controllers/concerns/bubble_scoped.rb
index bf123910c..5805b58ec 100644
--- a/app/controllers/concerns/bubble_scoped.rb
+++ b/app/controllers/concerns/bubble_scoped.rb
@@ -2,11 +2,15 @@ module BubbleScoped
   extend ActiveSupport::Concern
 
   included do
-    before_action :set_bubble
+    before_action :set_bubble, :set_bucket
   end
 
   private
     def set_bubble
-      @bubble = @bucket.bubbles.find(params[:bubble_id])
+      @bubble = Bubble.find(params[:bubble_id])
+    end
+
+    def set_bucket
+      @bucket = Current.user.buckets.find(@bubble.bucket_id)
     end
 end
diff --git a/app/controllers/readings_controller.rb b/app/controllers/readings_controller.rb
index 6482cd7c9..fe0761831 100644
--- a/app/controllers/readings_controller.rb
+++ b/app/controllers/readings_controller.rb
@@ -1,5 +1,5 @@
 class ReadingsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     mark_bubble_notifications_read
diff --git a/app/controllers/taggings_controller.rb b/app/controllers/taggings_controller.rb
index 629f4fb7a..e35db0b2f 100644
--- a/app/controllers/taggings_controller.rb
+++ b/app/controllers/taggings_controller.rb
@@ -1,5 +1,5 @@
 class TaggingsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def new
     render partial: "bubbles/tagging", locals: { bubble: @bubble, tags: Current.account.tags }