diff --git a/ShhShell/Views/Terminal/ShellTabView.swift b/ShhShell/Views/Terminal/ShellTabView.swift
index 06423d3..e35f6e1 100644
--- a/ShhShell/Views/Terminal/ShellTabView.swift
+++ b/ShhShell/Views/Terminal/ShellTabView.swift
@@ -147,19 +147,12 @@ struct ShellTabView: View {
 						.id(selectedID)
 						.transition(.opacity)
 					} else {
-						if let handler {
-							ShellView(
-								handler: handler,
-								hostsManager: hostsManager
-							)
+						Text("No Session")
 							.onAppear {
 								if selectedID == nil {
-									selectedID = handler.sessionID
+									selectedID = handler?.sessionID
 								}
 							}
-						} else {
-							Text("No Session")
-						}
 					}
 				}
 			}