diff --git a/osu.Game/Utils/BindableValueAccessor.cs b/osu.Game/Utils/BindableValueAccessor.cs
index dd097ada36..a4cd356339 100644
--- a/osu.Game/Utils/BindableValueAccessor.cs
+++ b/osu.Game/Utils/BindableValueAccessor.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Utils
 
         public static object GetValue(IBindable bindable)
         {
-            Type? bindableWithValueType = bindable.GetType().GetInterfaces().FirstOrDefault(isBindableT);
+            Type? bindableWithValueType = bindable.GetType().GetInterfaces().FirstOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IBindable<>));
             if (bindableWithValueType == null)
                 return bindable;
 
@@ -25,18 +25,13 @@ namespace osu.Game.Utils
 
         public static void SetValue(IBindable bindable, object value)
         {
-            Type? bindableWithValueType = bindable.GetType().EnumerateBaseTypes().FirstOrDefault(isBindableT);
+            Type? bindableWithValueType = bindable.GetType().EnumerateBaseTypes().SingleOrDefault(t => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(Bindable<>));
             if (bindableWithValueType == null)
                 return;
 
             set_method.MakeGenericMethod(bindableWithValueType.GenericTypeArguments[0]).Invoke(null, [bindable, value]);
         }
 
-        private static bool isBindableT(Type type)
-            => type.IsGenericType
-               && (type.GetGenericTypeDefinition() == typeof(Bindable<>)
-                   || type.GetGenericTypeDefinition() == typeof(IBindable<>));
-
         private static object getValue<T>(object bindable) => ((IBindable<T>)bindable).Value!;
 
         private static object setValue<T>(object bindable, object value) => ((Bindable<T>)bindable).Value = (T)value;