diff --git a/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/components/ConnectDBScreen/ConnectDBScreen.tsx b/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/components/ConnectDBScreen/ConnectDBScreen.tsx
index 6277e8e0ef995..5e6dcbcc76ecc 100644
--- a/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/components/ConnectDBScreen/ConnectDBScreen.tsx
+++ b/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/components/ConnectDBScreen/ConnectDBScreen.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { Dispatch } from '../../../../../types';
 
 import { OnboardingAnimation } from './components/OnboardingAnimation';
 import { NeonOnboarding } from './components/NeonOnboarding';
+import { trackCustomEvent } from '../../../../Analytics';
 
 type ConnectDBScreenProps = {
   proceed: VoidFunction;
@@ -12,6 +13,13 @@ type ConnectDBScreenProps = {
 };
 
 export function ConnectDBScreen(props: ConnectDBScreenProps) {
+  useEffect(() => {
+    trackCustomEvent({
+      location: 'Console',
+      action: 'Load',
+      object: 'Neon Onboarding Wizard',
+    });
+  }, []);
   const { proceed, dismissOnboarding, dispatch, setStepperIndex } = props;
 
   return (
diff --git a/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/hooks/useWizardState.ts b/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/hooks/useWizardState.ts
index ea3aec5d386cb..50f7243d2fcc5 100644
--- a/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/hooks/useWizardState.ts
+++ b/frontend/libs/console/legacy-ce/src/lib/features/CloudOnboarding/OnboardingWizard/hooks/useWizardState.ts
@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
 import { useSurveysData } from '../../../Surveys';
-import { trackCustomEvent } from '../../../Analytics';
 import { useOnboardingData } from './useOnboardingData';
 import { getWizardState } from '../utils';
 import { AllowedSurveyNames } from '../../../Surveys/types';
@@ -14,14 +13,6 @@ export type WizardState =
   | 'hidden';
 
 export function useWizardState() {
-  useEffect(() => {
-    trackCustomEvent({
-      location: 'Console',
-      action: 'Load',
-      object: 'Onboarding Wizard',
-    });
-  }, []);
-
   const {
     show: showSurvey,
     data: familiaritySurveyData,