diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index 0dd23a96a8..142515d797 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -2579,12 +2579,12 @@ TriggerBox::set_ignore_patch_changes (bool yn)
 void
 TriggerBox::fast_forward (CueEvents const & cues, samplepos_t transport_position)
 {
-	PBD::Unwinder<bool> uw (_fast_fowarding, true);
-
-	if (cues.empty() || cues.front().time > transport_position) {
+	if (cues.empty() || !(Config->get_cue_behavior() & FollowCues) || (cues.front().time > transport_position)) {
 		return;
 	}
 
+	PBD::Unwinder<bool> uw (_fast_fowarding, true);
+
 	using namespace Temporal;
 	TempoMap::SharedPtr tmap (TempoMap::use());