diff --git a/server/src/instance.rs b/server/src/instance.rs
index 34f72bd1..6feeb8f1 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -76,7 +76,7 @@ impl TimeControl {
 
     pub fn lobby_timeout(&self) -> DateTime<Utc> {
         Utc::now()
-            .checked_add_signed(Duration::minutes(5))
+            .checked_add_signed(Duration::seconds(30))
             .expect("could not set phase end")
     }
 
@@ -366,7 +366,7 @@ impl Instance {
     }
 
     fn current_game_id(&self) -> Option<Uuid> {
-        if self.phase == InstancePhase::Lobby {
+        if self.phase != InstancePhase::InProgress {
             return None;
         }