diff --git a/src/session.c b/src/session.c
index d279142a..ab7cdff9 100644
--- a/src/session.c
+++ b/src/session.c
@@ -395,6 +395,8 @@ int ssh_handle_packets(ssh_session session, int timeout) {
   enter_function();
   spoll_in=ssh_socket_get_poll_handle_in(session->socket);
   spoll_out=ssh_socket_get_poll_handle_out(session->socket);
+  if(session->server)
+    ssh_poll_add_events(spoll_in, POLLIN | POLLERR);
   ctx=ssh_poll_get_ctx(spoll_in);
   if(ctx==NULL){
   	ctx=ssh_poll_get_default_ctx(session);