diff --git a/platform/features/conductor-v2/conductor/res/templates/time-conductor.html b/platform/features/conductor-v2/conductor/res/templates/time-conductor.html
index d3c3427a06a..04befb7507e 100644
--- a/platform/features/conductor-v2/conductor/res/templates/time-conductor.html
+++ b/platform/features/conductor-v2/conductor/res/templates/time-conductor.html
@@ -91,7 +91,7 @@
             <div class="l-data-visualization">
                 <mct-include key="'time-of-interest'"
                              class="l-toi-holder show-val"
-                             ng-class="{ pinned: pinned, 'val-to-left': toi.left > 80 }"
+                             ng-class="{ pinned: toi.pinned, 'val-to-left': toi.left > 80 }"
                              ng-style="{'left': toi.left + '%'}"></mct-include>
             </div>
             <a class="l-page-button align-right s-icon-button icon-pointer-right"></a>
diff --git a/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js b/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
index 8eda031081f..654f0837ea8 100644
--- a/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
+++ b/platform/features/conductor-v2/conductor/src/ui/ConductorTOIController.js
@@ -58,9 +58,15 @@ define(
 
         ConductorTOIController.prototype.setOffsetFromBounds = function (bounds) {
             var toi = this.conductor.timeOfInterest();
-            var offset = toi - bounds.start;
-            var duration = bounds.end - bounds.start;
-            this.left = offset / duration * 100;
+            if (toi !== undefined) {
+                var offset = toi - bounds.start;
+                var duration = bounds.end - bounds.start;
+                this.left = offset / duration * 100;
+                this.pinned = true;
+            } else {
+                this.left = 0;
+                this.pinned = false;
+            }
         };
 
         ConductorTOIController.prototype.changeTimeOfInterest = function () {
diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html
index ff79be2aedb..5ca2721bced 100644
--- a/platform/features/plot/res/templates/plot.html
+++ b/platform/features/plot/res/templates/plot.html
@@ -80,7 +80,7 @@
                 <mct-include key="'time-of-interest'"
                              class="l-toi-holder show-val"
                              ng-if="toiPerc"
-                             ng-class="{ 'val-to-left': toiPerc > 80 }"
+                             ng-class="{ 'pinned': toiPinned, 'val-to-left': toiPerc > 80 }"
                              ng-style="{'left': toiPerc + '%'}"></mct-include>
 
                 <div class="gl-plot-coords"
diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js
index 7c58d2ed786..4ec02f6c8d0 100644
--- a/platform/features/plot/src/PlotController.js
+++ b/platform/features/plot/src/PlotController.js
@@ -252,8 +252,10 @@ define(
                     var bounds = conductor.bounds();
                     var range = bounds.end - bounds.start;
                     $scope.toiPerc = ((timeOfInterest - bounds.start) / range) * 100;
+                    $scope.toiPinned = true;
                 } else {
                     $scope.toiPerc = undefined;
+                    $scope.toiPinned = false;
                 }
             }
 
diff --git a/platform/features/table/src/controllers/MCTTableController.js b/platform/features/table/src/controllers/MCTTableController.js
index bdc2d47fb04..d196e9ba438 100644
--- a/platform/features/table/src/controllers/MCTTableController.js
+++ b/platform/features/table/src/controllers/MCTTableController.js
@@ -545,7 +545,7 @@ define(
 
             this.$scope.displayRows = this.filterAndSort(newRows || []);
             this.resize(newRows).then(this.setVisibleRows)
-                .then(this.timeout)
+                .then(this.$timeout)
                 .then(function() {
                     var timeOfInterest = this.conductor.timeOfInterest();
                     if (timeOfInterest) {