diff --git a/frontend/src/component/feature/form/form-add-feature-container.jsx b/frontend/src/component/feature/form/form-add-feature-container.jsx
index 28eab6bfb5..6835ffbc52 100644
--- a/frontend/src/component/feature/form/form-add-feature-container.jsx
+++ b/frontend/src/component/feature/form/form-add-feature-container.jsx
@@ -16,7 +16,7 @@ const mapStateToProps = createMapper({
         return { name };
     },
 });
-const prepare = (methods, dispatch) => {
+const prepare = (methods, dispatch, ownProps) => {
     methods.onSubmit = input => e => {
         e.preventDefault();
 
@@ -30,13 +30,13 @@ const prepare = (methods, dispatch) => {
 
         createFeatureToggles(input)(dispatch)
             .then(() => methods.clear())
-            .then(() => this.props.history.push(`/features/strategies/${input.name}`));
+            .then(() => ownProps.history.push(`/features/strategies/${input.name}`));
     };
 
     methods.onCancel = evt => {
         evt.preventDefault();
         methods.clear();
-        this.props.history.push('/features');
+        ownProps.history.push('/features');
     };
 
     methods.addStrategy = v => {
diff --git a/frontend/src/component/feature/form/form-update-feature-container.jsx b/frontend/src/component/feature/form/form-update-feature-container.jsx
index 0e0971cca7..d8839142b6 100644
--- a/frontend/src/component/feature/form/form-update-feature-container.jsx
+++ b/frontend/src/component/feature/form/form-update-feature-container.jsx
@@ -24,7 +24,7 @@ const mapStateToProps = createMapper({
     },
 });
 
-const prepare = (methods, dispatch) => {
+const prepare = (methods, dispatch, ownProps) => {
     methods.onSubmit = (input, features) => e => {
         e.preventDefault();
 
@@ -41,13 +41,13 @@ const prepare = (methods, dispatch) => {
         // TODO: should add error handling
         requestUpdateFeatureToggle(input)(dispatch)
             .then(() => methods.clear())
-            .then(() => this.props.history.push(`/features`));
+            .then(() => ownProps.history.push(`/features`));
     };
 
     methods.onCancel = evt => {
         evt.preventDefault();
         methods.clear();
-        this.props.history.push(`/features`);
+        ownProps.history.push(`/features`);
     };
 
     methods.addStrategy = v => {
diff --git a/frontend/src/component/feature/view-component.jsx b/frontend/src/component/feature/view-component.jsx
index 30ad2a84a9..16c2cbf3db 100644
--- a/frontend/src/component/feature/view-component.jsx
+++ b/frontend/src/component/feature/view-component.jsx
@@ -53,7 +53,9 @@ export default class ViewFeatureToggleComponent extends React.Component {
             return <HistoryComponent toggleName={featureToggleName} />;
         } else if (TABS[activeTab] === TABS.strategies) {
             if (this.isFeatureView) {
-                return <EditFeatureToggle featureToggle={featureToggle} features={features} />;
+                return (
+                    <EditFeatureToggle featureToggle={featureToggle} features={features} history={this.props.history} />
+                );
             }
             return <ViewFeatureToggle featureToggle={featureToggle} />;
         } else {
diff --git a/frontend/src/page/features/create.js b/frontend/src/page/features/create.js
index 7e65314b7d..8531c74052 100644
--- a/frontend/src/page/features/create.js
+++ b/frontend/src/page/features/create.js
@@ -1,6 +1,11 @@
 import React from 'react';
 import AddFeatureToggleForm from '../../component/feature/form/form-add-feature-container';
+import PropTypes from 'prop-types';
 
-const render = () => <AddFeatureToggleForm title="Create feature toggle" />;
+const render = ({ history }) => <AddFeatureToggleForm title="Create feature toggle" history={history} />;
+
+render.propTypes = {
+    history: PropTypes.object.isRequired,
+};
 
 export default render;
diff --git a/frontend/src/page/features/index.js b/frontend/src/page/features/index.js
index ccd602443e..bf18de3066 100644
--- a/frontend/src/page/features/index.js
+++ b/frontend/src/page/features/index.js
@@ -1,6 +1,11 @@
 import React from 'react';
 import FeatureListContainer from './../../component/feature/list-container';
+import PropTypes from 'prop-types';
 
-const render = () => <FeatureListContainer />;
+const render = ({ history }) => <FeatureListContainer history={history} />;
+
+render.propTypes = {
+    history: PropTypes.object.isRequired,
+};
 
 export default render;