diff --git a/scm-ui/src/config/components/form/NamespaceStrategySelect.js b/scm-ui/src/config/components/form/NamespaceStrategySelect.js
index a480dadc98..f1197e15c0 100644
--- a/scm-ui/src/config/components/form/NamespaceStrategySelect.js
+++ b/scm-ui/src/config/components/form/NamespaceStrategySelect.js
@@ -36,14 +36,22 @@ class NamespaceStrategySelect extends React.Component<Props> {
     });
   };
 
+  findSelected = () => {
+    const { namespaceStrategies, value } = this.props;
+    if (namespaceStrategies.available.indexOf(value) < 0) {
+      return namespaceStrategies.current;
+    }
+    return value;
+  };
+
   render() {
-    const { label, value, helpText, disabled, onChange } = this.props;
+    const { label, helpText, disabled, onChange } = this.props;
     const nsOptions = this.createNamespaceOptions();
     return (
       <Select
         label={label}
         onChange={onChange}
-        value={value}
+        value={this.findSelected()}
         disabled={disabled}
         options={nsOptions}
         helpText={helpText}