diff --git a/frontend/app/components/Session_/TimeTable/TimeTable.js b/frontend/app/components/Session_/TimeTable/TimeTable.js
index 7ab37101a..9753e3d44 100644
--- a/frontend/app/components/Session_/TimeTable/TimeTable.js
+++ b/frontend/app/components/Session_/TimeTable/TimeTable.js
@@ -135,7 +135,7 @@ export default class TimeTable extends React.PureComponent<Props, State> {
         ...computeTimeLine(this.props.rows, this.state.firstVisibleRowIndex, this.visibleCount),
       });
     }    
-    if (this.props.activeIndex && prevProps.activeIndex !== this.props.activeIndex) {
+    if (this.props.activeIndex && prevProps.activeIndex !== this.props.activeIndex && this.scroller.current != null) {
       this.scroller.current.scrollToRow(this.props.activeIndex);
     }
   }