diff --git a/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarMainWidgetComponent.kt b/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarMainWidgetComponent.kt
index 2cad758e6297..9b1a7e408f38 100644
--- a/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarMainWidgetComponent.kt
+++ b/platform/execution-impl/src/com/intellij/execution/runToolbar/RunToolbarMainWidgetComponent.kt
@@ -176,6 +176,7 @@ class RunToolbarMainWidgetComponent(val presentation: Presentation, place: Strin
 
   override fun removeProject() {
     project?.let {
+      DataManager.removeDataProvider(component)
       clearListeners(it)
       remove(it)
     }