diff --git a/libs/ardour/stripable.cc b/libs/ardour/stripable.cc
index adbb00ba94..0209960b0e 100644
--- a/libs/ardour/stripable.cc
+++ b/libs/ardour/stripable.cc
@@ -36,7 +36,9 @@ using std::string;
 
 Stripable::Stripable (Session& s, string const & name, PresentationInfo const & pi)
 	: SessionObject (s, name)
-	, Automatable (s, Temporal::TimeDomainProvider ((pi.flags() & PresentationInfo::MidiIndicatingFlags) ? Temporal::BeatTime : Temporal::AudioTime))
+	, Automatable (s, s.config.get_tracks_follow_session_time() ?
+	               Temporal::TimeDomainProvider ((pi.flags() & PresentationInfo::MidiIndicatingFlags) ? Temporal::BeatTime : Temporal::AudioTime) :
+	               Temporal::TimeDomainProvider (s.time_domain(), s))
 	, _presentation_info (pi)
 	, _active_color_picker (0)
 {