diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a22b86..cfc6a53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ Procedure when bumping the version number:
   Options previously located at `euph.rooms.*` should be reviewed and moved to `euph.servers."euphoria.leet.nu".rooms.*`.
 - Tweaked F1 popup
 - Tweaked chat message editor when nick list is foused
+- Reduced connection timeout from 30 seconds to 10 seconds
 
 ### Fixed
 - Room deletion popup accepting any room name
diff --git a/cove/src/ui/euph/room.rs b/cove/src/ui/euph/room.rs
index 8240ba5..c1c4fec 100644
--- a/cove/src/ui/euph/room.rs
+++ b/cove/src/ui/euph/room.rs
@@ -98,7 +98,6 @@ impl EuphRoom {
     pub fn connect(&mut self, next_instance_id: &mut usize) {
         if self.room.is_none() {
             let room = self.vault().room();
-            // TODO Decrease ping timeout
             let instance_config = self
                 .server_config
                 .clone()
diff --git a/cove/src/ui/rooms.rs b/cove/src/ui/rooms.rs
index a2319f9..48e3ad3 100644
--- a/cove/src/ui/rooms.rs
+++ b/cove/src/ui/rooms.rs
@@ -5,6 +5,7 @@ use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet};
 use std::iter;
 use std::sync::{Arc, Mutex};
+use std::time::Duration;
 
 use cove_config::{Config, Keys, RoomsSortOrder};
 use cove_input::InputEvent;
@@ -60,7 +61,9 @@ impl EuphServer {
         let cookies = logging_unwrap!(vault.cookies(domain.clone()).await);
         let config = ServerConfig::default()
             .domain(domain)
-            .cookies(Arc::new(Mutex::new(cookies)));
+            .cookies(Arc::new(Mutex::new(cookies)))
+            .timeout(Duration::from_secs(10));
+
         Self {
             config,
             next_instance_id: 0,