diff --git a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/StationStatistics.js b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/StationStatistics.js
index 7390e1bc39cdb444946acb9d483af2700c4a8ba5..bc9e806fb37db9838c705ba69a160a1f109f8a50 100644
--- a/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/StationStatistics.js
+++ b/LCU/Maintenance/MDB_WebView/maintenancedb_view/src/components/StationStatistics.js
@@ -27,7 +27,8 @@ class ToolBarC extends Component {
                     <option value="S">StationTest only</option>
                 </select>
                 <Input type="select" className="form-control custom-select custom-select-sm"
-                     onChange={(e)=>this.setAveragingWindow(e)}>
+                     onChange={(e)=>this.setAveragingWindow(e)}
+                     value={this.props.averaging_window}>
                     <option value={1}>day</option>
                     <option value={7}>week</option>
                     <option value={30}>month</option>
@@ -37,6 +38,9 @@ class ToolBarC extends Component {
     }
 }
 
+const mapStateToPropsToolBar = state => {
+    return  { ...state.landing_page.station_statistics};
+};
 
 const mapDispatchToPropsToolBar = {
     setStationStatisticsAveragingWindow,
@@ -44,7 +48,7 @@ const mapDispatchToPropsToolBar = {
 };
 
 
-const ToolBar = connect(null, mapDispatchToPropsToolBar)(ToolBarC);
+const ToolBar = connect(mapStateToPropsToolBar, mapDispatchToPropsToolBar)(ToolBarC);
 
 
 class StationStatisticsC extends Component {