diff --git a/src/client.go b/src/client.go
index c45cba0..a717996 100644
--- a/src/client.go
+++ b/src/client.go
@@ -388,9 +388,9 @@ func (c *Croc) dialUp() (err error) {
 				return
 			}
 			defer connection.Close()
-			connection.SetReadDeadline(time.Now().Add(1 * time.Hour))
-			connection.SetDeadline(time.Now().Add(1 * time.Hour))
-			connection.SetWriteDeadline(time.Now().Add(1 * time.Hour))
+			connection.SetReadDeadline(time.Now().Add(3 * time.Hour))
+			connection.SetDeadline(time.Now().Add(3 * time.Hour))
+			connection.SetWriteDeadline(time.Now().Add(3 * time.Hour))
 			message, err := receiveMessage(connection)
 			if err != nil {
 				errorChan <- err
diff --git a/src/models.go b/src/models.go
index 7efa878..b7ab589 100644
--- a/src/models.go
+++ b/src/models.go
@@ -68,7 +68,7 @@ type Croc struct {
 func Init() (c *Croc) {
 	c = new(Croc)
 	c.TcpPorts = []string{"27030", "27031", "27032", "27033"}
-	c.Timeout = 10 * time.Minute
+	c.Timeout = 3 * time.Hour
 	c.UseEncryption = true
 	c.UseCompression = true
 	c.AllowLocalDiscovery = true
diff --git a/src/server.go b/src/server.go
index 9186042..d21dcf3 100644
--- a/src/server.go
+++ b/src/server.go
@@ -265,7 +265,7 @@ func (c *Croc) processPayload(ws *websocket.Conn, cd channelData) (channel strin
 }
 
 func (c *Croc) channelCleanup() {
-	maximumWait := 10 * time.Minute
+	maximumWait := 3 * time.Hour
 	for {
 		c.rs.Lock()
 		keys := make([]string, len(c.rs.channel))