diff --git a/src/comm/comm.go b/src/comm/comm.go
index 631000c..d5a905e 100644
--- a/src/comm/comm.go
+++ b/src/comm/comm.go
@@ -18,7 +18,7 @@ type Comm struct {
 func New(c net.Conn) Comm {
 	c.SetReadDeadline(time.Now().Add(3 * time.Hour))
 	c.SetDeadline(time.Now().Add(3 * time.Hour))
-	c.SetWriteDeadline(time.Now().Add(3 * time.Hour))
+	c.SetWriteDeadline(time.Now().Add(5 * time.Second))
 	return Comm{c}
 }
 
diff --git a/src/croc/sending.go b/src/croc/sending.go
index 2869644..1da231d 100644
--- a/src/croc/sending.go
+++ b/src/croc/sending.go
@@ -183,7 +183,7 @@ func (c *Croc) sendReceive(address, websocketPort string, tcpPorts []string, fna
 			}
 			select {
 			case <-done:
-			case <-time.After(time.Second):
+			case <-time.After(100 * time.Millisecond):
 			}
 			return nil
 		}