diff --git a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs b/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs
index 24cfca38f8..d144a1a136 100644
--- a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs
+++ b/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs
@@ -58,10 +58,9 @@ namespace Content.Shared.GameObjects.Components.Body
         [ViewVariables]
         public IReadOnlyDictionary<string, IBodyPart> Parts => _parts;
 
+        [ViewVariables]
         public IReadOnlyDictionary<string, string> PartIds => _partIds;
 
-        [ViewVariables] public IReadOnlyDictionary<string, string> PartIDs => _partIds;
-
         public override void Initialize()
         {
             base.Initialize();
@@ -116,6 +115,7 @@ namespace Content.Shared.GameObjects.Components.Body
             }
 
             Connections = cleanedConnections;
+            CalculateSpeed();
         }
 
         protected virtual bool CanAddPart(string slot, IBodyPart part)
@@ -473,7 +473,7 @@ namespace Content.Shared.GameObjects.Components.Body
             var legs = GetPartsWithProperty<LegComponent>();
             float speedSum = 0;
 
-            foreach (var leg in GetPartsWithProperty<LegComponent>())
+            foreach (var leg in legs)
             {
                 var footDistance = DistanceToNearestFoot(leg.part);