diff --git a/main-server/app/services/jwt_service.rb b/main-server/app/services/jwt_service.rb
index 7999cba..7fc0348 100644
--- a/main-server/app/services/jwt_service.rb
+++ b/main-server/app/services/jwt_service.rb
@@ -4,7 +4,7 @@ class JwtService
   EXPIRATION = 7.days
 
   def self.encode(payload)
-    payload[:exp] = EXPIRATION.from_now.to_i
+    payload[:exp] = EXPIRATION.from_now.to_i if payload[:exp] == nil
     JWT.encode(payload, SECRET_KEY, ALGORITHM)
   end
 
diff --git a/main-server/app/services/matchmaking_service.rb b/main-server/app/services/matchmaking_service.rb
index 30b43d0..cbc24a2 100644
--- a/main-server/app/services/matchmaking_service.rb
+++ b/main-server/app/services/matchmaking_service.rb
@@ -99,14 +99,14 @@ class MatchmakingService
         player1_id: player1_id,
         player2_id: player2_id,
         game_server: GAME_SERVER,
-        exp: 1.hour.from_now.to_i
+        exp: 2.minute.from_now.to_i
       )
 
       match_data = {
         match_id: match_id,
         game_token: game_token,
         game_server: GAME_SERVER,
-        players: [player1_id, player2_id]
+        players: [ player1_id, player2_id ]
       }
 
       # Store match data for both players