diff --git a/internal/ui/model/sidebar.go b/internal/ui/model/sidebar.go
index 1f63f020d228b8b975306fead7cb75d7167a717e..11d7b73baee60fbf68514ae34fb5aeaf459a16d9 100644
--- a/internal/ui/model/sidebar.go
+++ b/internal/ui/model/sidebar.go
@@ -96,6 +96,10 @@ func getDynamicHeightLimits(availableHeight int) (maxFiles, maxLSPs, maxMCPs int
 // sidebar renders the chat sidebar containing session title, working
 // directory, model info, file list, LSP status, and MCP status.
 func (m *UI) drawSidebar(scr uv.Screen, area uv.Rectangle) {
+	if m.session == nil {
+		return
+	}
+
 	const logoHeightBreakpoint = 30
 
 	t := m.com.Styles