diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 6b8f13c58c..f8dc520a37 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -177,7 +177,6 @@ CONFIG_VARIABLE (AutoReturnTarget, auto_return_target_list, "auto-return-target-
 CONFIG_VARIABLE (bool, reset_default_speed_on_stop, "reset-default-speed-on-stop", false)
 CONFIG_VARIABLE (bool, rewind_ffwd_like_tape_decks, "rewind-ffwd-like-tape-decks", true)
 CONFIG_VARIABLE (bool, auto_return_after_rewind_ffwd, "auto-return-after-rewind-ffwd", false)
-CONFIG_VARIABLE (CueBehavior, cue_behavior, "cue-behavior", FollowCues)
 
 /* metering */
 
diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index 721a5b2b80..f9be1ed4c5 100644
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -37,6 +37,7 @@ CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
 CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
 CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
 CONFIG_VARIABLE (bool, triggerbox_overrides_disk_monitoring, "triggerbox-overrides-disk-monitoring", true)
+CONFIG_VARIABLE (CueBehavior, cue_behavior, "cue-behavior", FollowCues)
 CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
 CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
 CONFIG_VARIABLE (bool, count_in, "count-in", false)
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 3c41ca7b89..514e2dca12 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -1645,7 +1645,7 @@ Session::first_cue_within (samplepos_t s, samplepos_t e, bool& was_recorded)
 		return active_cue;
 	}
 
-	if (!(Config->get_cue_behavior() & FollowCues)) {
+	if (!(config.get_cue_behavior() & FollowCues)) {
 		return -1;
 	}
 
diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc
index 3846ff45db..d84da6a9ff 100644
--- a/libs/ardour/triggerbox.cc
+++ b/libs/ardour/triggerbox.cc
@@ -2681,7 +2681,7 @@ TriggerBox::parameter_changed (std::string const & param)
 		reconnect_to_default ();
 
 	} else if (param == "cue-behavior") {
-		bool follow = (Config->get_cue_behavior() & FollowCues);
+		bool follow = (_session.config.get_cue_behavior() & FollowCues);
 		if (follow) {
 
 			/* XXX this is all wrong. We have to do the
@@ -2712,7 +2712,7 @@ TriggerBox::fast_forward (CueEvents const & cues, samplepos_t transport_position
 {
 	DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1: ffwd to %2\n", order(), transport_position));
 
-	if (!(Config->get_cue_behavior() & FollowCues)) {
+	if (!(_session.config.get_cue_behavior() & FollowCues)) {
 		/* do absolutely nothing */
 		return;
 	}