diff --git a/repos/gems/src/server/ssh_terminal/server.cc b/repos/gems/src/server/ssh_terminal/server.cc
index 5b9509f188..4ca61373da 100644
--- a/repos/gems/src/server/ssh_terminal/server.cc
+++ b/repos/gems/src/server/ssh_terminal/server.cc
@@ -193,6 +193,7 @@ void Ssh::Server::_cleanup_session(Session &s)
 	ssh_channel_free(s.channel);
 	s.channel = nullptr;
 
+	ssh_blocking_flush(s.session, 5*1000);
 	ssh_event_remove_session(_event_loop, s.session);
 	ssh_disconnect(s.session);
 	ssh_free(s.session);