diff --git a/app/controllers/buckets_controller.rb b/app/controllers/buckets_controller.rb
index dfbf076e0..a388968b5 100644
--- a/app/controllers/buckets_controller.rb
+++ b/app/controllers/buckets_controller.rb
@@ -38,7 +38,7 @@ class BucketsController < ApplicationController
     end
 
     def bucket_params
-      params.expect(bucket: [ :name ]).merge(all_access: params[:bucket].fetch(:all_access, false))
+      params.expect(bucket: [ :name, :all_access ]).with_defaults(all_access: false)
     end
 
     def grantees