diff --git a/crates/bevy_pbr/src/lib.rs b/crates/bevy_pbr/src/lib.rs
index 366456b51d3fe..8366dbe673e1f 100644
--- a/crates/bevy_pbr/src/lib.rs
+++ b/crates/bevy_pbr/src/lib.rs
@@ -189,7 +189,6 @@ impl Plugin for PbrPlugin {
                 check_light_mesh_visibility
                     .label(SimulationLightSystems::CheckLightVisibility)
                     .after(TransformSystem::TransformPropagate)
-                    .after(VisibilitySystems::CalculateBounds)
                     .after(SimulationLightSystems::UpdateLightFrusta)
                     // NOTE: This MUST be scheduled AFTER the core renderer visibility check
                     // because that resets entity ComputedVisibility for the first view
diff --git a/crates/bevy_render/src/view/visibility/mod.rs b/crates/bevy_render/src/view/visibility/mod.rs
index e4a57217c1bc1..f3381ac74c790 100644
--- a/crates/bevy_render/src/view/visibility/mod.rs
+++ b/crates/bevy_render/src/view/visibility/mod.rs
@@ -212,7 +212,7 @@ impl Plugin for VisibilityPlugin {
 
         app.add_system_to_stage(
             CoreStage::PostUpdate,
-            calculate_bounds.label(CalculateBounds),
+            calculate_bounds.label(CalculateBounds).before_commands(),
         )
         .add_system_to_stage(
             CoreStage::PostUpdate,
@@ -252,7 +252,6 @@ impl Plugin for VisibilityPlugin {
             CoreStage::PostUpdate,
             check_visibility
                 .label(CheckVisibility)
-                .after(CalculateBounds)
                 .after(UpdateOrthographicFrusta)
                 .after(UpdatePerspectiveFrusta)
                 .after(UpdateProjectionFrusta)