diff --git a/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py b/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py
index 347124e480d..2efc2ee6117 100644
--- a/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py
+++ b/scripts/addons_core/rigify/rigs/limbs/limb_rigs.py
@@ -708,7 +708,7 @@ class BaseLimbRig(BaseRig):
 
     def rig_hide_pole_control(self, name: str):
         self.make_driver(
-            self.get_bone(name).bone, "hide",
+            self.get_bone(name), "hide",
             variables=[(self.prop_bone, 'pole_vector')], polynomial=[1.0, -1.0],
         )
 
diff --git a/scripts/addons_core/rigify/rigs/limbs/spline_tentacle.py b/scripts/addons_core/rigify/rigs/limbs/spline_tentacle.py
index 329c2221b75..7497cbb955f 100644
--- a/scripts/addons_core/rigify/rigs/limbs/spline_tentacle.py
+++ b/scripts/addons_core/rigify/rigs/limbs/spline_tentacle.py
@@ -533,7 +533,7 @@ class Rig(SimpleChainRig):
             self.make_constraint(ctrl, 'MAINTAIN_VOLUME', mode='UNIFORM', owner_space='LOCAL')
 
         self.rig_enable_control_driver(
-            self.get_bone(ctrl).bone, 'hide', subtype, index, disable=True)
+            self.get_bone(ctrl), 'hide', subtype, index, disable=True)
 
     @stage.generate_widgets
     def make_main_control_widgets(self):
@@ -1009,7 +1009,7 @@ class RigifySplineTentacleIk2FkBase:
         # Find currently enabled controls
         visible_ctrls = [
             bone for bone in ctrl_bones[1:-1]
-            if not (bone.bone.hide and obj.data.animation_data.drivers.find(bone.bone.path_from_id("hide")))
+            if not (bone.hide and obj.animation_data.drivers.find(bone.path_from_id("hide")))
         ]
         ctrl_count = len(visible_ctrls) + (0 if self.use_tip else 1)
         max_pos = 1 - 0.25 / ctrl_count