diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/create_connector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/create_connector.tsx
index a4ed43e2a8fcd..6e83bf98c2371 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/create_connector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connectors/create_connector/create_connector.tsx
@@ -67,10 +67,8 @@ export const CreateConnector: React.FC = () => {
 
   useEffect(() => {
     // TODO: separate this to ability and preference
-    if (!selectedConnector?.isNative || !selfManagePreference) {
+    if (selectedConnector && !selectedConnector.isNative && selfManagePreference === 'native') {
       setSelfManagePreference('selfManaged');
-    } else {
-      setSelfManagePreference('native');
     }
   }, [selectedConnector]);
 
@@ -276,11 +274,11 @@ export const CreateConnector: React.FC = () => {
                 </EuiFormRow>
                 <EuiSpacer size="s" />
                 <EuiBadge color="hollow">
-                  {selfManagePreference
+                  {selfManagePreference === 'selfManaged'
                     ? i18n.translate(
                         'xpack.enterpriseSearch.createConnector.badgeType.selfManaged',
                         {
-                          defaultMessage: 'Self managed',
+                          defaultMessage: 'Self-managed',
                         }
                       )
                     : i18n.translate(