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 0fa2f3b8a2..5defe79f14 100644
--- a/packages/unleash-frontend-next/src/component/feature/configure-strategy.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/configure-strategy.jsx
@@ -63,7 +63,7 @@ class ConfigureStrategies extends React.Component {
             );
         }
 
-        const inputFields = this.renderInputFields(this.props.strategyDefinition);
+        const inputFields = this.renderInputFields(this.props.strategyDefinition) || [];
 
         return (
             <ListItem leftActions={leftActions}
diff --git a/packages/unleash-frontend-next/src/component/feature/strategies-add.jsx b/packages/unleash-frontend-next/src/component/feature/strategies-add.jsx
index 80963ce599..d3d6b9b2ec 100644
--- a/packages/unleash-frontend-next/src/component/feature/strategies-add.jsx
+++ b/packages/unleash-frontend-next/src/component/feature/strategies-add.jsx
@@ -57,9 +57,8 @@ class AddStrategy extends React.Component {
             <Dropdown
                 source={strats}
                 onChange={this.addStrategy}
-                label="Select activation strategy to add"
+                label="+ Add strategy"
                 template={this.customItem}
-                value={this.props.strategies[0].name}
             />
         );
     }