diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 9ef3633819..bff71f002b 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -6158,26 +6158,34 @@ void
 Session::set_range_selection (framepos_t start, framepos_t end)
 {
 	_range_selection = Evoral::Range<framepos_t> (start, end);
+#ifdef USE_TRACKS_CODE_FEATURES
 	follow_playhead_priority ();
+#endif
 }
 
 void
 Session::set_object_selection (framepos_t start, framepos_t end)
 {
 	_object_selection = Evoral::Range<framepos_t> (start, end);
+#ifdef USE_TRACKS_CODE_FEATURES
 	follow_playhead_priority ();
+#endif
 }
 
 void
 Session::clear_range_selection ()
 {
 	_range_selection = Evoral::Range<framepos_t> (-1,-1);
+#ifdef USE_TRACKS_CODE_FEATURES
 	follow_playhead_priority ();
+#endif
 }
 
 void
 Session::clear_object_selection ()
 {
 	_object_selection = Evoral::Range<framepos_t> (-1,-1);
+#ifdef USE_TRACKS_CODE_FEATURES
 	follow_playhead_priority ();
+#endif	
 }