diff --git a/Assets/VRM10_Samples/ClothSample/ClothWarp/Editor/ClothWarpRootEditor.cs b/Assets/VRM10_Samples/ClothSample/ClothWarp/Editor/ClothWarpRootEditor.cs
index 5ab4f8919..42caa1362 100644
--- a/Assets/VRM10_Samples/ClothSample/ClothWarp/Editor/ClothWarpRootEditor.cs
+++ b/Assets/VRM10_Samples/ClothSample/ClothWarp/Editor/ClothWarpRootEditor.cs
@@ -158,7 +158,7 @@ namespace UniVRM10.ClothWarp.Components
             }
         }
 #if UNITY_6000_5_OR_NEWER
-        static int GetControlId(Component component) => EntityId.ToULong(component.GetEntityId()).GetHashCode();
+        static int GetControlId(Component component) => component.GetEntityId().GetHashCode();
 #else
         static int GetControlId(Component component) => component.GetInstanceID();
 #endif
diff --git a/Packages/VRM10/Editor/Components/SpringBone/SpringBoneTreeView.cs b/Packages/VRM10/Editor/Components/SpringBone/SpringBoneTreeView.cs
index ee8bb9c55..f20bd5812 100644
--- a/Packages/VRM10/Editor/Components/SpringBone/SpringBoneTreeView.cs
+++ b/Packages/VRM10/Editor/Components/SpringBone/SpringBoneTreeView.cs
@@ -308,7 +308,7 @@ namespace UniVRM10
         }
 
 #if UNITY_6000_5_OR_NEWER
-        static int GetControlId(Component component) => EntityId.ToULong(component.GetEntityId()).GetHashCode();
+        static int GetControlId(Component component) => component.GetEntityId().GetHashCode();
 #else
         static int GetControlId(Component component) => component.GetInstanceID();
 #endif