diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go
index e8197835a2ef393409940a416380257831f32267..d75b70f596b9c7564846bc5962d31f1d519cbdf4 100644
--- a/internal/tui/components/chat/sidebar/sidebar.go
+++ b/internal/tui/components/chat/sidebar/sidebar.go
@@ -50,6 +50,8 @@ func (m *sidebarCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if msg.ID != m.session.ID {
 			m.session = msg
 		}
+	case chat.SessionClearedMsg:
+		m.session = session.Session{}
 	case pubsub.Event[session.Session]:
 		if msg.Type == pubsub.UpdatedEvent {
 			if m.session.ID == msg.Payload.ID {
diff --git a/internal/tui/tui.go b/internal/tui/tui.go
index 47b17014b56cd18ea61597b52d26859a8eccaf11..56e439c686d5f0a07775788abb25be55c182e5a5 100644
--- a/internal/tui/tui.go
+++ b/internal/tui/tui.go
@@ -100,6 +100,8 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	// Session
 	case cmpChat.SessionSelectedMsg:
 		a.selectedSessionID = msg.ID
+	case cmpChat.SessionClearedMsg:
+		a.selectedSessionID = ""
 	// Logs
 	case pubsub.Event[logging.LogMessage]:
 		// Send to the status component