diff --git a/futures-util/src/stream/stream/buffered.rs b/futures-util/src/stream/stream/buffered.rs
index 2445a85c52..3d0c5f5569 100644
--- a/futures-util/src/stream/stream/buffered.rs
+++ b/futures-util/src/stream/stream/buffered.rs
@@ -1,4 +1,4 @@
-use crate::stream::{Fuse, FuturesOrdered, StreamExt};
+use crate::stream::{Fuse, FuturesOrdered, StreamExt, FusedStream};
 use futures_core::future::Future;
 use futures_core::stream::Stream;
 use futures_core::task::{Context, Poll};
@@ -18,6 +18,7 @@ where
     stream: Fuse<St>,
     in_progress_queue: FuturesOrdered<St::Item>,
     max: usize,
+    is_terminated: bool,
 }
 
 impl<St> Unpin for Buffered<St>
@@ -36,10 +37,21 @@ where
             .field("stream", &self.stream)
             .field("in_progress_queue", &self.in_progress_queue)
             .field("max", &self.max)
+            .field("is_terminated", &self.is_terminated)
             .finish()
     }
 }
 
+impl<St> FusedStream for Buffered<St>
+where
+    St: FusedStream,
+    St::Item: Future,
+{
+    fn is_terminated(&self) -> bool {
+        self.is_terminated
+    }
+}
+
 impl<St> Buffered<St>
 where
     St: Stream,
@@ -47,12 +59,14 @@ where
 {
     unsafe_pinned!(stream: Fuse<St>);
     unsafe_unpinned!(in_progress_queue: FuturesOrdered<St::Item>);
+    unsafe_unpinned!(is_terminated: bool);
 
     pub(super) fn new(stream: St, n: usize) -> Buffered<St> {
         Buffered {
             stream: super::Fuse::new(stream),
             in_progress_queue: FuturesOrdered::new(),
             max: n,
+            is_terminated: false,
         }
     }
 
@@ -117,6 +131,9 @@ where
 
         // If more values are still coming from the stream, we're not done yet
         if self.stream.is_done() {
+            // We yield a `None`, so now the stream is considered terminated.
+            *self.as_mut().is_terminated() = true;
+
             Poll::Ready(None)
         } else {
             Poll::Pending