diff --git a/client/src/lib.rs b/client/src/lib.rs
index fc73ee4abd..5d1bf26eab 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -53,7 +53,7 @@ use vek::*;
 // The duration of network inactivity until the player is kicked
 // @TODO: in the future, this should be configurable on the server
 // and be provided to the client
-const SERVER_TIMEOUT: f64 = 20.0;
+const SERVER_TIMEOUT: f64 = 40.0;
 
 // After this duration has elapsed, the user will begin getting kick warnings in
 // their chat window
diff --git a/server/src/lib.rs b/server/src/lib.rs
index b2ea02a8a8..40ef0ebac4 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -70,7 +70,7 @@ use world::{
 #[macro_use] extern crate diesel;
 #[macro_use] extern crate diesel_migrations;
 
-const CLIENT_TIMEOUT: f64 = 20.0; // Seconds
+const CLIENT_TIMEOUT: f64 = 40.0; // Seconds
 
 #[derive(Copy, Clone)]
 struct SpawnPoint(Vec3<f32>);