diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index b6730c188..ec394b0b9 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -280,6 +280,9 @@ conf:
       rgw_keystone_token_cache_size: 0
       #NOTE (JCL): See http://tracker.ceph.com/issues/7073
       rgw_gc_max_objs: 997
+      #NOTE (JCL): See http://tracker.ceph.com/issues/24937
+      #NOTE (JCL): See https://tracker.ceph.com/issues/24551
+      rgw_dynamic_resharding: false
   rgw_s3:
     enabled: false
     admin_caps: "users=*;buckets=*;zone=*"