diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a41e51..83a2cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Unreleased
 
-Nothing.
+- Correctly override `Body::size_hint` and `Body::is_end_stream` for `Empty`.
 
 # 0.4.1 (March 18, 2021)
 
diff --git a/src/empty.rs b/src/empty.rs
index b12bf4c..7d63ceb 100644
--- a/src/empty.rs
+++ b/src/empty.rs
@@ -1,4 +1,4 @@
-use super::Body;
+use super::{Body, SizeHint};
 use bytes::Buf;
 use http::HeaderMap;
 use std::{
@@ -40,6 +40,14 @@ impl<D: Buf> Body for Empty<D> {
     ) -> Poll<Result<Option<HeaderMap>, Self::Error>> {
         Poll::Ready(Ok(None))
     }
+
+    fn is_end_stream(&self) -> bool {
+        true
+    }
+
+    fn size_hint(&self) -> SizeHint {
+        SizeHint::with_exact(0)
+    }
 }
 
 impl<D> fmt::Debug for Empty<D> {