diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
index aea68cdd6711c..6ffefa1be4bf0 100644
--- a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
+++ b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
@@ -63,7 +63,7 @@ export function InstallElasticAgent() {
     useState<ElasticAgentPlatform>('linux-tar');
 
   const enforcedDatasetName =
-    integration === dataset ? dataset : `${integration}.${dataset}`;
+    (integration === dataset ? dataset : `${integration}.${dataset}`) ?? '';
 
   async function onContinue() {
     await singleDatasetLocator!.navigate({
@@ -113,7 +113,7 @@ export function InstallElasticAgent() {
         return callApi('POST /internal/observability_onboarding/logs/flow', {
           params: {
             body: {
-              name: datasetName,
+              name: datasetName ?? '',
               type: 'logFiles',
               state: {
                 datasetName,
diff --git a/x-pack/plugins/observability_onboarding/public/index.ts b/x-pack/plugins/observability_onboarding/public/index.ts
index b83c5b6d5cad0..9454626e80dc8 100644
--- a/x-pack/plugins/observability_onboarding/public/index.ts
+++ b/x-pack/plugins/observability_onboarding/public/index.ts
@@ -17,9 +17,6 @@ import {
   ObservabilityOnboardingPluginStart,
 } from './plugin';
 
-export { OBSERVABILITY_ONBOARDING_LOCATOR } from './locators/onboarding_locator/locator_definition';
-export type { ObservabilityOnboardingLocatorParams } from './locators/onboarding_locator/types';
-
 export interface ConfigSchema {
   ui: {
     enabled: boolean;
diff --git a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts b/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts
index 93bb3861740cd..9ebd263847f36 100644
--- a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts
+++ b/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ObservabilityOnboardingLocatorParams } from './types';
+import type { ObservabilityOnboardingLocatorParams } from '@kbn/deeplinks-observability/locators';
 import { PLUGIN_ID } from '../../../common';
 
 export function getLocation(params: ObservabilityOnboardingLocatorParams) {