diff --git a/src/server/connection.rs b/src/server/connection.rs
index 6f8f8f843..4767e05fc 100644
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -391,13 +391,7 @@ const SEC30: Duration = Duration::from_secs(30);
 const H1: Duration = Duration::from_secs(3600);
 const MILLI1: Duration = Duration::from_millis(1);
 const SEND_TIMEOUT_VIDEO: u64 = 12_000;
-// The same horizon as the 30 s read timeout: a peer that has not drained a
-// single message for that long is the same dead peer that check would catch.
-const SEND_TIMEOUT_OTHER: u64 = 30_000;
-// The raw port-forward loop's write to the local target: that loop idles for
-// an hour before giving up, and a target that stops draining is not a dead
-// peer, so this keeps the value the write always had.
-const PORT_FORWARD_LOCAL_SEND_TIMEOUT: u64 = 120_000;
+const SEND_TIMEOUT_OTHER: u64 = SEND_TIMEOUT_VIDEO * 10;
 const SESSION_TIMEOUT: Duration = Duration::from_secs(30);
 
 /// Whether the DRM backend can serve a Wayland login screen here.
@@ -1240,7 +1234,7 @@ impl Connection {
                     res = self.stream.next() => {
                         if let Some(res) = res {
                             last_recv_time = Instant::now();
-                            timeout(PORT_FORWARD_LOCAL_SEND_TIMEOUT, forward.send(res?)).await??;
+                            timeout(SEND_TIMEOUT_OTHER, forward.send(res?)).await??;
                         } else {
                             bail!("Stream reset by the peer");
                         }