diff --git a/src/common/table.js b/src/common/table.js
index c3daff5..8ea1579 100644
--- a/src/common/table.js
+++ b/src/common/table.js
@@ -204,7 +204,8 @@ class CustomTable extends Component {
           key={childkey++}
           ikey={childkey++}
           icon={'wave-square'}
-          disabled={child.props.onAutoConf == null}
+          disabled={child.props.onAutoConf == null || child.props.locked }
+          hidetooltip={isLocked}
           tooltip={"Autoconfigure Signals"}
           tipPlacement={'bottom'}
           onClick={() => child.props.onAutoConf(index)}
diff --git a/src/componentconfig/config-table.js b/src/componentconfig/config-table.js
index d5e1b8f..665850e 100644
--- a/src/componentconfig/config-table.js
+++ b/src/componentconfig/config-table.js
@@ -375,6 +375,7 @@ class ConfigTable extends Component {
             signalButton
             onAutoConf={(index) => this.signalsAutoConf(index)}
             width={170}
+            locked={this.props.locked}
           />
           <TableColumn
             title='Infrastructure Component'
diff --git a/src/scenario/scenario.js b/src/scenario/scenario.js
index f19a01b..ac618d7 100644
--- a/src/scenario/scenario.js
+++ b/src/scenario/scenario.js
@@ -53,7 +53,6 @@ class Scenario extends React.Component {
     let scenarioID = parseInt(props.match.params.scenario, 10)
 
       return{
-        sessionToken: localStorage.getItem("token"),
         scenario: ScenarioStore.getState().find(s => s.id === scenarioID),
         results: ResultStore.getState().filter(result => result.scenarioID === scenarioID),
         sessionToken: localStorage.getItem("token"),