diff --git a/packages/unleash-frontend-next/src/component/feature/add-container.jsx b/packages/unleash-frontend-next/src/component/feature/add-container.jsx
index 3ece661dcd..18bcc9e93d 100644
--- a/packages/unleash-frontend-next/src/component/feature/add-container.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/add-container.jsx
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { hashHistory } from 'react-router';
+import { browserHistory } from 'react-router';
 
 
 import { createFeatureToggles } from '../../store/feature-actions';
@@ -21,7 +21,7 @@ const prepare = (methods, dispatch) => {
 
     methods.onCancel = (evt) => {
         evt.preventDefault();
-        hashHistory.push('/features');
+        browserHistory.push('/features');
     };
 
     methods.addStrategy = (v) => {
diff --git a/packages/unleash-frontend-next/src/component/feature/configure-strategy.jsx b/packages/unleash-frontend-next/src/component/feature/configure-strategy.jsx
index db70d89850..b74bcc168b 100644
--- a/packages/unleash-frontend-next/src/component/feature/configure-strategy.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/configure-strategy.jsx
@@ -35,6 +35,8 @@ class ConfigureStrategies extends React.Component {
     }
 
     renderInputFields (strategyDefinition) {
+        
+
         if (strategyDefinition.parametersTemplate) {
             return Object.keys(strategyDefinition.parametersTemplate).map(field => (
                 <Input
@@ -50,7 +52,17 @@ class ConfigureStrategies extends React.Component {
     }
 
     render () {
+        if (!this.props.strategyDefinition) {
+            return (
+                <div>
+                    <span style={{ color: 'red' }}>Strategy "{this.props.strategy.name}" deleted</span>
+                    <Button title="Remove Strategy" onClick={this.handleRemove} icon="remove" floating accent mini />
+                </div>
+            )
+        }
+
         const inputFields = this.renderInputFields(this.props.strategyDefinition);
+
         return (
             <div>
                 <strong>{this.props.strategy.name}</strong>