diff --git a/client/src/lib.rs b/client/src/lib.rs
index bd9a7ae61f..3e0eeaa217 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -26,7 +26,7 @@ use common::{
     msg::{ClientMsg, ServerMsg},
 };
 
-const SERVER_TIMEOUT: f64 = 5.0; // Seconds
+const SERVER_TIMEOUT: f64 = 20.0; // Seconds
 
 pub enum Event {
     Chat(String),
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 9b43de8e82..0eb84959b5 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -25,7 +25,7 @@ use threadpool::ThreadPool;
 use vek::*;
 use world::World;
 
-const CLIENT_TIMEOUT: f64 = 5.0; // Seconds
+const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
 
 pub enum Event {
     ClientConnected { entity: EcsEntity },