diff --git a/frontend/src/component/onboarding/dialog/ConnectSdkDialog.tsx b/frontend/src/component/onboarding/dialog/ConnectSdkDialog.tsx
index 96c16b2784..72cd45f88e 100644
--- a/frontend/src/component/onboarding/dialog/ConnectSdkDialog.tsx
+++ b/frontend/src/component/onboarding/dialog/ConnectSdkDialog.tsx
@@ -170,7 +170,7 @@ export const ConnectSdkDialog = ({
                                 ) : null}
 
                                 <Button variant='contained' onClick={onFinish}>
-                                    Next
+                                    Complete
                                 </Button>
                             </NextStepSectionSpacedContainer>
                         </Navigation>
diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
index e28dc0bda2..c8f427ab17 100644
--- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
+++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx
@@ -430,7 +430,9 @@ export const ProjectFeatureToggles = ({
                 }
             />
             <ConditionallyRender
-                condition={setupCompletedState === 'show-setup'}
+                condition={
+                    setupCompletedState === 'show-setup' && !isOnboarding
+                }
                 show={
                     <ProjectOnboarded
                         projectId={projectId}