diff --git a/apps/web/src/components/layout/components/v2/HeaderNav.tsx b/apps/web/src/components/layout/components/v2/HeaderNav.tsx
index ec083da9c2d..39ef8f7e4e9 100644
--- a/apps/web/src/components/layout/components/v2/HeaderNav.tsx
+++ b/apps/web/src/components/layout/components/v2/HeaderNav.tsx
@@ -14,18 +14,14 @@ import { NotificationCenterWidget } from '../NotificationCenterWidget';
 import { HeaderMenuItems } from './HeaderMenuItems';
 import { UserProfileButton } from '../../../../ee/clerk';
 import { BridgeMenuItems } from './BridgeMenuItems';
-import { useStudioState } from '../../../../studio/StudioStateProvider';
 import { WorkflowHeaderBackButton } from './WorkflowHeaderBackButton';
 
 export function HeaderNav() {
   const { currentUser } = useAuth();
-  const { bridgeURL } = useStudioState();
 
   const isSelfHosted = IS_SELF_HOSTED;
   const isV2Enabled = useFeatureFlag(FeatureFlagsKeysEnum.IS_V2_ENABLED);
 
-  const shouldShowNewNovuExperience = isV2Enabled && bridgeURL;
-
   useBootIntercom();
 
   const { Icon, themeLabel, toggleColorScheme } = useThemeChange();
@@ -43,9 +39,11 @@ export function HeaderNav() {
     >
       {/* TODO: Change position: right to space-between for breadcrumbs */}
       <HStack justifyContent="space-between" width="full" display="flex">
-        <HStack gap="100">{shouldShowNewNovuExperience && <WorkflowHeaderBackButton />}</HStack>
+        <HStack gap="100">
+          <WorkflowHeaderBackButton />
+        </HStack>
         <HStack flexWrap={'nowrap'} justifyContent="flex-end" gap={'100'}>
-          {shouldShowNewNovuExperience && <BridgeMenuItems />}
+          {isV2Enabled && <BridgeMenuItems />}
           <ActionIcon variant="transparent" onClick={() => toggleColorScheme()}>
             <Tooltip label={themeLabel}>
               <div>
diff --git a/apps/web/src/ee/clerk/components/QuestionnaireForm.tsx b/apps/web/src/ee/clerk/components/QuestionnaireForm.tsx
index 776ef6d1f74..2bcc8189682 100644
--- a/apps/web/src/ee/clerk/components/QuestionnaireForm.tsx
+++ b/apps/web/src/ee/clerk/components/QuestionnaireForm.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import { Controller, useForm } from 'react-hook-form';
 import { useMutation } from '@tanstack/react-query';
@@ -16,7 +16,7 @@ import { Button, inputStyles, Select } from '@novu/design-system';
 import styled from '@emotion/styled/macro';
 import { api } from '../../../api/api.client';
 import { useAuth } from '../../../hooks/useAuth';
-import { useFeatureFlag, useVercelIntegration, useVercelParams, useEffectOnce, useContainer } from '../../../hooks';
+import { useFeatureFlag, useVercelIntegration } from '../../../hooks';
 import { ROUTES } from '../../../constants/routes';
 import { useSegment } from '../../../components/providers/SegmentProvider';
 import { BRIDGE_SYNC_SAMPLE_ENDPOINT } from '../../../config/index';
@@ -31,7 +31,6 @@ function updateClerkOrgMetadata(data: UpdateExternalOrganizationDto) {
 
 export function QuestionnaireForm() {
   const { isSupported } = useWebContainerSupported();
-  const isV2Enabled = useFeatureFlag(FeatureFlagsKeysEnum.IS_V2_ENABLED);
   const isPlaygroundOnboardingEnabled = useFeatureFlag(FeatureFlagsKeysEnum.IS_PLAYGROUND_ONBOARDING_ENABLED);
   const [loading, setLoading] = useState<boolean>();
   const {