diff --git a/packages/app/src/app/components/WorkspaceSetup/StepHeader.tsx b/packages/app/src/app/components/WorkspaceSetup/StepHeader.tsx
index 6be007766d8..5c6dad39f23 100644
--- a/packages/app/src/app/components/WorkspaceSetup/StepHeader.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/StepHeader.tsx
@@ -6,7 +6,6 @@ interface StepHeaderProps {
   currentStep: number;
   title: string;
   headerNote?: React.ReactNode;
-  workspaceId?: string;
   onPrevStep: () => void;
   onDismiss: () => void;
 }
diff --git a/packages/app/src/app/components/WorkspaceSetup/steps/Addons.tsx b/packages/app/src/app/components/WorkspaceSetup/steps/Addons.tsx
index 70d57ca8fd3..9713dcd5320 100644
--- a/packages/app/src/app/components/WorkspaceSetup/steps/Addons.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/steps/Addons.tsx
@@ -55,7 +55,6 @@ export const Addons: React.FC<StepProps> = ({
               ? 'Update plan'
               : 'Choose your add-ons (optional)'
           }
-          workspaceId={urlWorkspaceId}
         />
 
         <Stack direction="vertical" gap={8}>
diff --git a/packages/app/src/app/components/WorkspaceSetup/steps/ChangeLegacyPlan.tsx b/packages/app/src/app/components/WorkspaceSetup/steps/ChangeLegacyPlan.tsx
index 49ec5ca6c5c..2673d43d7d6 100644
--- a/packages/app/src/app/components/WorkspaceSetup/steps/ChangeLegacyPlan.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/steps/ChangeLegacyPlan.tsx
@@ -47,7 +47,6 @@ export const ChangeLegacyPlan: React.FC<StepProps> = ({
           currentStep={currentStep}
           numberOfSteps={numberOfSteps}
           title="Review plan"
-          workspaceId={urlWorkspaceId}
         />
 
         <Text color="#e5e5e5">You are switching to the following plan:</Text>
diff --git a/packages/app/src/app/components/WorkspaceSetup/steps/ChangePlan.tsx b/packages/app/src/app/components/WorkspaceSetup/steps/ChangePlan.tsx
index 89515701ba2..3f52b7969ba 100644
--- a/packages/app/src/app/components/WorkspaceSetup/steps/ChangePlan.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/steps/ChangePlan.tsx
@@ -56,7 +56,6 @@ export const ChangePlan: React.FC<StepProps> = ({
           currentStep={currentStep}
           numberOfSteps={numberOfSteps}
           title="Review plan"
-          workspaceId={urlWorkspaceId}
         />
 
         <Text color="#e5e5e5">You are switching to the following plan:</Text>
diff --git a/packages/app/src/app/components/WorkspaceSetup/steps/Payment.tsx b/packages/app/src/app/components/WorkspaceSetup/steps/Payment.tsx
index 83b9cec97e4..4d7a990fdcc 100644
--- a/packages/app/src/app/components/WorkspaceSetup/steps/Payment.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/steps/Payment.tsx
@@ -99,7 +99,6 @@ export const Payment: React.FC<StepProps> = ({
               ? 'Redirecting to payment to provider'
               : 'Cannot redirect to payment provider'
           }
-          workspaceId={workspaceId}
         />
 
         {checkout.status === 'error' ? (
diff --git a/packages/app/src/app/components/WorkspaceSetup/steps/Plans.tsx b/packages/app/src/app/components/WorkspaceSetup/steps/Plans.tsx
index 629a2c38e8d..8ba49b5a0a1 100644
--- a/packages/app/src/app/components/WorkspaceSetup/steps/Plans.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/steps/Plans.tsx
@@ -127,7 +127,6 @@ export const Plans: React.FC<StepProps> = ({
           currentStep={currentStep}
           numberOfSteps={numberOfSteps}
           title={`Choose a plan ${headerSuffix}`}
-          workspaceId={urlWorkspaceId}
           headerNote={
             <>
               Your workspace is currently on the{' '}
diff --git a/packages/app/src/app/components/WorkspaceSetup/steps/SpendingLimit.tsx b/packages/app/src/app/components/WorkspaceSetup/steps/SpendingLimit.tsx
index 7324861afab..1f039d2edd5 100644
--- a/packages/app/src/app/components/WorkspaceSetup/steps/SpendingLimit.tsx
+++ b/packages/app/src/app/components/WorkspaceSetup/steps/SpendingLimit.tsx
@@ -78,7 +78,6 @@ export const SpendingLimit: React.FC<StepProps> = ({
           currentStep={currentStep}
           numberOfSteps={numberOfSteps}
           title="Set a spending limit"
-          workspaceId={urlWorkspaceId}
         />
 
         <Text color="#a6a6a6">