diff --git a/frontend/common/providers/OrganisationProvider.js b/frontend/common/providers/OrganisationProvider.js
index 9fe62bba960b..9374ad366c56 100644
--- a/frontend/common/providers/OrganisationProvider.js
+++ b/frontend/common/providers/OrganisationProvider.js
@@ -20,6 +20,10 @@ const OrganisationProvider = class extends Component {
       users: OrganisationStore.getUsers(),
     }
     ES6Component(this)
+    if (props.onRemoveProject) {
+      this.listenTo(OrganisationStore, 'removed', props.onRemoveProject)
+    }
+
     this.listenTo(OrganisationStore, 'change', () => {
       this.setState({
         groups: UserGroupStore.getGroups(),
diff --git a/frontend/web/components/ProjectManageWidget.tsx b/frontend/web/components/ProjectManageWidget.tsx
index a86dd15e0113..a6cf84cbd006 100644
--- a/frontend/web/components/ProjectManageWidget.tsx
+++ b/frontend/web/components/ProjectManageWidget.tsx
@@ -67,7 +67,11 @@ const ProjectManageWidget: FC<SegmentsPageType> = ({
   }, [handleCreateProjectClick, router.route.location])
 
   return (
-    <OrganisationProvider>
+    <OrganisationProvider
+      onRemoveProject={() => {
+        toast('Your project has been removed')
+      }}
+    >
       {({
         isLoading,
         projects,
diff --git a/frontend/web/components/pages/ProjectSettingsPage.js b/frontend/web/components/pages/ProjectSettingsPage.js
index ac89d301b322..78df1fe4634f 100644
--- a/frontend/web/components/pages/ProjectSettingsPage.js
+++ b/frontend/web/components/pages/ProjectSettingsPage.js
@@ -77,12 +77,6 @@ const ProjectSettingsPage = class extends Component {
       AppActions.getProject(this.props.match.params.projectId)
     }
   }
-
-  onRemove = () => {
-    toast('Your project has been removed')
-    this.context.router.history.replace('/projects')
-  }
-
   confirmRemove = (project, cb) => {
     openModal(
       'Delete Project',
@@ -163,7 +157,6 @@ const ProjectSettingsPage = class extends Component {
       <div className='app-container container'>
         <ProjectProvider
           id={this.props.match.params.projectId}
-          onRemove={this.onRemove}
           onSave={this.onSave}
         >
           {({ deleteProject, editProject, isLoading, isSaving, project }) => {
@@ -430,6 +423,7 @@ const ProjectSettingsPage = class extends Component {
                           <Button
                             onClick={() =>
                               this.confirmRemove(project, () => {
+                                this.context.router.history.replace('/projects')
                                 deleteProject(this.props.match.params.projectId)
                               })
                             }