diff --git a/scm-ui/src/config/components/form/NamespaceStrategySelect.js b/scm-ui/src/config/components/form/NamespaceStrategySelect.js
index 71f54de247..9de25cfca5 100644
--- a/scm-ui/src/config/components/form/NamespaceStrategySelect.js
+++ b/scm-ui/src/config/components/form/NamespaceStrategySelect.js
@@ -38,7 +38,11 @@ class NamespaceStrategySelect extends React.Component<Props> {
 
   findSelected = () => {
     const { namespaceStrategies, value } = this.props;
-    if (namespaceStrategies.available.indexOf(value) < 0) {
+    if (
+      !namespaceStrategies ||
+      !namespaceStrategies.available ||
+      namespaceStrategies.available.indexOf(value) < 0
+    ) {
       return namespaceStrategies.current;
     }
     return value;