diff --git a/x-pack/plugins/stack_connectors/public/connector_types/inference/connector.tsx b/x-pack/plugins/stack_connectors/public/connector_types/inference/connector.tsx
index ac465b98f267..5f854384dbb5 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/inference/connector.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/inference/connector.tsx
@@ -123,7 +123,6 @@ const InferenceAPIConnectorFields: React.FunctionComponent<ActionConnectorFields
       const newTaskType = currentTaskTypes?.find((p) => p.task_type === taskType);
 
       setSelectedTaskType(taskType);
-      generateInferenceEndpointId(config, setFieldValue);
 
       // transform the schema
       const newTaskTypeSchema = Object.keys(newTaskType?.configuration ?? {}).map((k) => ({
@@ -151,6 +150,10 @@ const InferenceAPIConnectorFields: React.FunctionComponent<ActionConnectorFields
           taskTypeConfig: configDefaults,
         },
       });
+      generateInferenceEndpointId(
+        { ...config, taskType, taskTypeConfig: configDefaults },
+        setFieldValue
+      );
     },
     [config, providers, setFieldValue, updateFieldValues]
   );
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/render_service_provider/service_provider.tsx b/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/render_service_provider/service_provider.tsx
index 986b07b4a069..5eb8518a5ea1 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/render_service_provider/service_provider.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/render_service_provider/service_provider.tsx
@@ -26,7 +26,7 @@ interface ServiceProviderProps {
   searchValue?: string;
 }
 
-type ProviderSolution = 'Observability' | 'Security' | 'Search';
+export type ProviderSolution = 'Observability' | 'Security' | 'Search';
 
 interface ServiceProviderRecord {
   icon: string;
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/selectable/index.tsx b/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/selectable/index.tsx
index d4527e9c7b9a..fc31c9dd6c4f 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/selectable/index.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/inference/providers/selectable/index.tsx
@@ -11,6 +11,7 @@ import React, { memo, useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { ServiceProviderKeys } from '../../../../../common/inference/constants';
 import {
+  ProviderSolution,
   SERVICE_PROVIDERS,
   ServiceProviderIcon,
   ServiceProviderName,
@@ -47,7 +48,20 @@ const SelectableProviderComponent: React.FC<SelectableProviderProps> = ({
 
   const renderProviderOption = useCallback<NonNullable<EuiSelectableProps['renderOption']>>(
     (option, searchValue) => {
-      const provider = SERVICE_PROVIDERS[option.label as ServiceProviderKeys];
+      const provider = Object.keys(SERVICE_PROVIDERS).includes(option.label)
+        ? SERVICE_PROVIDERS[option.label as ServiceProviderKeys]
+        : undefined;
+
+      const supportedBySolutions = (provider &&
+        provider.solutions.map((solution) => (
+          <EuiFlexItem>
+            <EuiBadge color="hollow">{solution}</EuiBadge>
+          </EuiFlexItem>
+        ))) ?? (
+        <EuiFlexItem>
+          <EuiBadge color="hollow">{'Search' as ProviderSolution}</EuiBadge>
+        </EuiFlexItem>
+      );
       return (
         <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
           <EuiFlexItem grow={false}>
@@ -65,12 +79,7 @@ const SelectableProviderComponent: React.FC<SelectableProviderProps> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiFlexGroup gutterSize="xs" responsive={false}>
-              {provider &&
-                provider.solutions.map((solution) => (
-                  <EuiFlexItem>
-                    <EuiBadge color="hollow">{solution}</EuiBadge>
-                  </EuiFlexItem>
-                ))}
+              {supportedBySolutions}
             </EuiFlexGroup>
           </EuiFlexItem>
         </EuiFlexGroup>