diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp
index 7197e34d..587ab3a2 100644
--- a/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp
+++ b/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp
@@ -350,19 +350,12 @@ void USGWristTrackerComponent::FImpl::UpdateMotionSource() const
         return;
     }
 
-    UWorld* World{Owner->GetWorld()};
-    if (!World)
-    {
-        return;
-    }
-
-    if (World->IsGameWorld() && Owner->HasBeenInitialized())
-    {
-        Owner->MotionSource = Owner->IsRight()
-            ? Owner->GetWristTrackingSettings().RightHandMotionSource
-            : Owner->GetWristTrackingSettings().LeftHandMotionSource;
-        FMotionDelayService::RegisterDelayTarget(Owner, Owner->PlayerIndex, Owner->MotionSource);
-    }
+    const FName& TrackingMotionSource{
+        Owner->IsRight()
+        ? Owner->GetWristTrackingSettings().RightHandMotionSource
+        : Owner->GetWristTrackingSettings().LeftHandMotionSource
+    };
+    Owner->SetTrackingMotionSource(TrackingMotionSource);
 }
 
 void USGWristTrackerComponent::FImpl::UpdateWristTrackingData() const