diff --git a/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js b/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
index ee7b2dc9591..9db200cf3c1 100644
--- a/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
+++ b/platform/features/conductor-v2/conductor/src/ui/TimeConductorController.js
@@ -120,6 +120,13 @@ define(
                     $scope.formModel.startDelta = deltas.start;
                     $scope.formModel.endDelta = deltas.end;
                 }
+
+                // Show filtered list of time systems available for the
+                // current mode
+                var tickSourceType = this.modes[mode.key()].tickSourceType;
+                $scope.timeSystemModel.options = this.timeSystemsForSourceType(tickSourceType).map(function (t) {
+                    return t.metadata;
+                });
             } else {
                 // Default to fixed mode
                 this.setMode('fixed');