diff --git a/lightyear/src/client/interpolation/visual_interpolation.rs b/lightyear/src/client/interpolation/visual_interpolation.rs
index ec567e166..2aba9b7b0 100644
--- a/lightyear/src/client/interpolation/visual_interpolation.rs
+++ b/lightyear/src/client/interpolation/visual_interpolation.rs
@@ -63,10 +63,7 @@ impl<C: SyncComponent> Plugin for VisualInterpolationPlugin<C> {
             )
                 .chain(),
         );
-        app.configure_sets(
-            FixedPostUpdate,
-            InterpolationSet::UpdateVisualInterpolationState,
-        );
+        app.configure_sets(FixedLast, InterpolationSet::UpdateVisualInterpolationState);
         app.configure_sets(
             PostUpdate,
             InterpolationSet::VisualInterpolation
@@ -82,7 +79,7 @@ impl<C: SyncComponent> Plugin for VisualInterpolationPlugin<C> {
                 .in_set(InterpolationSet::RestoreVisualInterpolation),
         );
         app.add_systems(
-            FixedPostUpdate,
+            FixedLast,
             update_visual_interpolation_status::<C>
                 .in_set(InterpolationSet::UpdateVisualInterpolationState),
         );
diff --git a/lightyear/src/utils/avian3d.rs b/lightyear/src/utils/avian3d.rs
index dab191d88..893d4c1b0 100644
--- a/lightyear/src/utils/avian3d.rs
+++ b/lightyear/src/utils/avian3d.rs
@@ -38,7 +38,6 @@ impl Plugin for Avian3dPlugin {
                 // run physics before updating the prediction history
                 PredictionSet::UpdateHistory,
                 PredictionSet::IncrementRollbackTick,
-                InterpolationSet::UpdateVisualInterpolationState,
             )
                 .after(PhysicsSet::StepSimulation)
                 .after(PhysicsSet::Sync),