diff --git a/ShhShell/Views/Terminal/SSHTerminalDelegate.swift b/ShhShell/Views/Terminal/SSHTerminalDelegate.swift
index acbe0b9..b26092f 100644
--- a/ShhShell/Views/Terminal/SSHTerminalDelegate.swift
+++ b/ShhShell/Views/Terminal/SSHTerminalDelegate.swift
@@ -25,7 +25,7 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina
 		applySelectedTheme()
 		
 		Task {
-			await restoreScrollback()
+//			await restoreScrollback()
 			await startFeedLoop()
 		}
 	}
diff --git a/ShhShell/Views/Terminal/TerminalController.swift b/ShhShell/Views/Terminal/TerminalController.swift
index f65f5ad..e181f36 100644
--- a/ShhShell/Views/Terminal/TerminalController.swift
+++ b/ShhShell/Views/Terminal/TerminalController.swift
@@ -19,6 +19,9 @@ struct TerminalController: UIViewRepresentable {
 	func makeUIView(context: Context) -> TerminalView {
 		if let sessionID = handler.sessionID {
 			if let existing = container.sessions[sessionID] {
+				Task {
+					await existing.terminalView.restoreScrollback()
+				}
 				return existing.terminalView
 			}
 		}