diff --git a/crates/debugger_ui/src/debugger_panel.rs b/crates/debugger_ui/src/debugger_panel.rs
index b28b59bd99..fbec89f14f 100644
--- a/crates/debugger_ui/src/debugger_panel.rs
+++ b/crates/debugger_ui/src/debugger_panel.rs
@@ -130,10 +130,6 @@ impl DebugPanel {
                         project::Event::DebugClientStopped(client_id) => {
                             cx.emit(DebugPanelEvent::ClientStopped(*client_id));
 
-                            this.dap_store.update(cx, |store, cx| {
-                                store.remove_active_debug_line_for_client(client_id, cx);
-                            });
-
                             this.thread_states
                                 .retain(|&(client_id_, _), _| client_id_ != *client_id);
 
diff --git a/crates/debugger_ui/src/debugger_panel_item.rs b/crates/debugger_ui/src/debugger_panel_item.rs
index 35ea7c91e1..4b7c93b8d7 100644
--- a/crates/debugger_ui/src/debugger_panel_item.rs
+++ b/crates/debugger_ui/src/debugger_panel_item.rs
@@ -308,6 +308,10 @@ impl DebugPanelItem {
 
         self.update_thread_state_status(ThreadStatus::Stopped, cx);
 
+        self.dap_store.update(cx, |store, cx| {
+            store.remove_active_debug_line_for_client(client_id, cx);
+        });
+
         cx.emit(DebugPanelItemEvent::Close);
     }