diff --git a/src/delivery.rs b/src/delivery.rs
index f9f7288..f4dbcdb 100644
--- a/src/delivery.rs
+++ b/src/delivery.rs
@@ -134,6 +134,10 @@ impl Delivery {
     }
 
     pub async fn wait(&self) -> Result<Option<DeliveryState>, AmqpProtocolError> {
+        if self.0.flags.get().contains(Flags::LOCAL_SETTLED) {
+            return Ok(None);
+        }
+
         let rx = if let Some(inner) = self
             .session
             .inner