diff --git a/frontend/web/components/modals/CreateFlag.js b/frontend/web/components/modals/CreateFlag.js
index 7e6bb0869ae5..6264d5314a65 100644
--- a/frontend/web/components/modals/CreateFlag.js
+++ b/frontend/web/components/modals/CreateFlag.js
@@ -1755,9 +1755,9 @@ const CreateFlag = class extends Component {
                                                                 e.stopPropagation()
                                                                 removeUserOverride(
                                                                   {
-                                                                    cb: () =>
+                                                                    cb: () => 
                                                                       this.userOverridesPage(
-                                                                        1,
+                                                                        1, true
                                                                       ),
                                                                     environmentId:
                                                                       this.props
diff --git a/frontend/web/components/release-pipelines/CreateReleasePipeline.tsx b/frontend/web/components/release-pipelines/CreateReleasePipeline.tsx
index 3dac31853fb5..440957d9d890 100644
--- a/frontend/web/components/release-pipelines/CreateReleasePipeline.tsx
+++ b/frontend/web/components/release-pipelines/CreateReleasePipeline.tsx
@@ -359,7 +359,7 @@ function CreateReleasePipeline() {
                       handleOnChange(stageData, index)
                     }
                     projectId={Number(projectId)}
-                    showRemoveButton={index > 0}
+                    showRemoveButton={pipelineData.stages.length > 1}
                     onRemove={() => handleRemoveStage(index)}
                   />
                   <div className='flex-1'>