diff --git a/src/hyperion/experiment_plans/flyscan_xray_centre_plan.py b/src/hyperion/experiment_plans/flyscan_xray_centre_plan.py
index 1e56c44e2..bb2e44018 100755
--- a/src/hyperion/experiment_plans/flyscan_xray_centre_plan.py
+++ b/src/hyperion/experiment_plans/flyscan_xray_centre_plan.py
@@ -324,6 +324,10 @@ def run_gridscan_and_move(
             fgs_composite.sample_motors.stub_offsets, StubPosition.CURRENT_AS_CENTER
         )
 
+    # Wait on everything before returning to GDA (particularly apertures), can be removed
+    # when we do not return to GDA here
+    yield from bps.wait()
+
 
 def flyscan_xray_centre(
     composite: FlyScanXRayCentreComposite,
diff --git a/src/hyperion/experiment_plans/panda_flyscan_xray_centre_plan.py b/src/hyperion/experiment_plans/panda_flyscan_xray_centre_plan.py
index cd578b7f2..550d97967 100755
--- a/src/hyperion/experiment_plans/panda_flyscan_xray_centre_plan.py
+++ b/src/hyperion/experiment_plans/panda_flyscan_xray_centre_plan.py
@@ -249,6 +249,10 @@ def run_gridscan_and_move(
             fgs_composite.sample_motors.stub_offsets, StubPosition.CURRENT_AS_CENTER
         )
 
+    # Wait on everything before returning to GDA (particularly apertures), can be removed
+    # when we do not return to GDA here
+    yield from bps.wait()
+
 
 def panda_flyscan_xray_centre(
     composite: FlyScanXRayCentreComposite,
diff --git a/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py
index cd1e0352c..eeba9a102 100644
--- a/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py
+++ b/tests/unit_tests/experiment_plans/test_flyscan_xray_centre_plan.py
@@ -242,7 +242,8 @@ def test_read_hardware_for_ispyb_updates_from_ophyd_devices(
         assert hyperion_params.ispyb_params.sample_barcode == "BARCODE"
 
     @patch(
-        "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range"
+        "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+        return_value=Status(done=True, success=True),
     )
     @patch(
         "hyperion.experiment_plans.flyscan_xray_centre_plan.run_gridscan", autospec=True
@@ -348,6 +349,7 @@ def test_results_passed_to_move_motors(
 
     @patch(
         "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+        return_value=Status(done=True, success=True),
     )
     @patch(
         "hyperion.experiment_plans.flyscan_xray_centre_plan.run_gridscan", autospec=True
diff --git a/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py b/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py
index 593f24a83..85dbcb1ef 100644
--- a/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py
+++ b/tests/unit_tests/experiment_plans/test_panda_flyscan_xray_centre_plan.py
@@ -198,7 +198,8 @@ def test_read_hardware_for_ispyb_updates_from_ophyd_devices(
         assert params.hyperion_params.ispyb_params.sample_barcode == "BARCODE"
 
     @patch(
-        "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range"
+        "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+        return_value=Status(done=True, success=True),
     )
     @patch(
         "hyperion.experiment_plans.panda_flyscan_xray_centre_plan.run_gridscan",
@@ -318,6 +319,7 @@ def test_results_passed_to_move_motors(
 
     @patch(
         "dodal.devices.aperturescatterguard.ApertureScatterguard._safe_move_within_datacollection_range",
+        return_value=Status(done=True, success=True),
     )
     @patch(
         "hyperion.experiment_plans.panda_flyscan_xray_centre_plan.run_gridscan",