diff --git a/internal/multiplex/datagramBufferedPipe.go b/internal/multiplex/datagramBufferedPipe.go
index 9a99b80..e1a0462 100644
--- a/internal/multiplex/datagramBufferedPipe.go
+++ b/internal/multiplex/datagramBufferedPipe.go
@@ -42,17 +42,20 @@ func (d *datagramBufferedPipe) Read(target []byte) (int, error) {
 			return 0, io.EOF
 		}
 
-		if !d.rDeadline.IsZero() {
-			delta := time.Until(d.rDeadline)
-			if delta <= 0 {
+		hasRDeadline := !d.rDeadline.IsZero()
+		if hasRDeadline {
+			if time.Until(d.rDeadline) <= 0 {
 				return 0, ErrTimeout
 			}
-			d.broadcastAfter(delta)
 		}
 
 		if len(d.pLens) > 0 {
 			break
 		}
+
+		if hasRDeadline {
+			d.broadcastAfter(time.Until(d.rDeadline))
+		}
 		d.rwCond.Wait()
 	}
 	dataLen := d.pLens[0]
@@ -76,15 +79,12 @@ func (d *datagramBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
 		if d.closed && len(d.pLens) == 0 {
 			return 0, io.EOF
 		}
-		if !d.rDeadline.IsZero() {
-			delta := time.Until(d.rDeadline)
-			if delta <= 0 {
+
+		hasRDeadline := !d.rDeadline.IsZero()
+		if hasRDeadline {
+			if time.Until(d.rDeadline) <= 0 {
 				return 0, ErrTimeout
 			}
-			if d.wtTimeout == 0 {
-				// if there hasn't been a scheduled broadcast
-				d.broadcastAfter(delta)
-			}
 		}
 
 		if len(d.pLens) > 0 {
@@ -98,7 +98,11 @@ func (d *datagramBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
 			}
 			d.rwCond.Broadcast()
 		} else {
-			if d.wtTimeout != 0 {
+			if d.wtTimeout == 0 {
+				if hasRDeadline {
+					d.broadcastAfter(time.Until(d.rDeadline))
+				}
+			} else {
 				d.rDeadline = time.Now().Add(d.wtTimeout)
 				d.broadcastAfter(d.wtTimeout)
 			}
diff --git a/internal/multiplex/streamBufferedPipe.go b/internal/multiplex/streamBufferedPipe.go
index 52ae512..66dacec 100644
--- a/internal/multiplex/streamBufferedPipe.go
+++ b/internal/multiplex/streamBufferedPipe.go
@@ -39,16 +39,20 @@ func (p *streamBufferedPipe) Read(target []byte) (int, error) {
 		if p.closed && p.buf.Len() == 0 {
 			return 0, io.EOF
 		}
-		if !p.rDeadline.IsZero() {
-			d := time.Until(p.rDeadline)
-			if d <= 0 {
+
+		hasRDeadline := !p.rDeadline.IsZero()
+		if hasRDeadline {
+			if time.Until(p.rDeadline) <= 0 {
 				return 0, ErrTimeout
 			}
-			p.broadcastAfter(d)
 		}
 		if p.buf.Len() > 0 {
 			break
 		}
+
+		if hasRDeadline {
+			p.broadcastAfter(time.Until(p.rDeadline))
+		}
 		p.rwCond.Wait()
 	}
 	n, err := p.buf.Read(target)
@@ -67,15 +71,12 @@ func (p *streamBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
 		if p.closed && p.buf.Len() == 0 {
 			return 0, io.EOF
 		}
-		if !p.rDeadline.IsZero() {
-			d := time.Until(p.rDeadline)
-			if d <= 0 {
+
+		hasRDeadline := !p.rDeadline.IsZero()
+		if hasRDeadline {
+			if time.Until(p.rDeadline) <= 0 {
 				return 0, ErrTimeout
 			}
-			if p.wtTimeout == 0 {
-				// if there hasn't been a scheduled broadcast
-				p.broadcastAfter(d)
-			}
 		}
 		if p.buf.Len() > 0 {
 			written, er := p.buf.WriteTo(w)
@@ -86,10 +87,15 @@ func (p *streamBufferedPipe) WriteTo(w io.Writer) (n int64, err error) {
 			}
 			p.rwCond.Broadcast()
 		} else {
-			if p.wtTimeout != 0 {
+			if p.wtTimeout == 0 {
+				if hasRDeadline {
+					p.broadcastAfter(time.Until(p.rDeadline))
+				}
+			} else {
 				p.rDeadline = time.Now().Add(p.wtTimeout)
 				p.broadcastAfter(p.wtTimeout)
 			}
+
 			p.rwCond.Wait()
 		}
 	}