diff --git a/transports/noise/src/io.rs b/transports/noise/src/io.rs
index 84aad79d76b..69edabe686e 100644
--- a/transports/noise/src/io.rs
+++ b/transports/noise/src/io.rs
@@ -69,6 +69,10 @@ impl<T: AsyncRead + Unpin> AsyncRead for Output<T> {
         cx: &mut Context<'_>,
         buf: &mut [u8],
     ) -> Poll<io::Result<usize>> {
+        if buf.is_empty() {
+            return Poll::Ready(Ok(0));
+        }
+
         loop {
             let len = self.recv_buffer.len();
             let off = self.recv_offset;
diff --git a/transports/noise/tests/smoke.rs b/transports/noise/tests/smoke.rs
index abc5a038f93..bc4d35ea24f 100644
--- a/transports/noise/tests/smoke.rs
+++ b/transports/noise/tests/smoke.rs
@@ -111,6 +111,33 @@ fn xx() {
         .quickcheck(prop as fn(Vec<Message>) -> bool)
 }
 
+#[test]
+fn read_into_empty_buffer_returns_immediately() {
+    let server_id = identity::Keypair::generate_ed25519();
+    let client_id = identity::Keypair::generate_ed25519();
+
+    let (client, server) = futures_ringbuf::Endpoint::pair(100, 100);
+
+    futures::executor::block_on(async move {
+        let ((_reported_client_id, mut server_session), (_reported_server_id, _client_session)) =
+            futures::future::try_join(
+                noise::Config::new(&server_id)
+                    .unwrap()
+                    .upgrade_inbound(server, ""),
+                noise::Config::new(&client_id)
+                    .unwrap()
+                    .upgrade_outbound(client, ""),
+            )
+            .await
+            .unwrap();
+
+        let mut buf = [];
+        let read = server_session.read(&mut buf).now_or_never();
+
+        assert!(matches!(read, Some(Ok(0))));
+    });
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct Message(Vec<u8>);