diff --git a/libssh/channels.c b/libssh/channels.c
index 84a222eb..c603d7ab 100644
--- a/libssh/channels.c
+++ b/libssh/channels.c
@@ -1748,6 +1748,9 @@ int channel_poll(ssh_channel channel, int is_stderr){
     }
   }
 
+  if (buffer_get_rest_len(stdbuf) > 0)
+    return buffer_get_rest_len(stdbuf);
+
   if (channel->remote_eof) {
     leave_function();
     return SSH_EOF;