diff --git a/pkg/controller/chat/chat.go b/pkg/controller/chat/chat.go
index adf0e9d..3131149 100644
--- a/pkg/controller/chat/chat.go
+++ b/pkg/controller/chat/chat.go
@@ -82,9 +82,7 @@ func Landing() http.HandlerFunc {
 				ProfileURL: "/u/" + currentUser.Username,
 				Nickname:   currentUser.NameOrUsername(),
 				RegisteredClaims: jwt.RegisteredClaims{
-					// TODO: ExpiresAt 60 minutes to work around chat server reliability,
-					// should be shorter like 5 minutes.
-					ExpiresAt: jwt.NewNumericDate(time.Now().Add(60 * time.Minute)),
+					ExpiresAt: jwt.NewNumericDate(time.Now().Add(5 * time.Minute)),
 					IssuedAt:  jwt.NewNumericDate(time.Now()),
 					NotBefore: jwt.NewNumericDate(time.Now()),
 					Issuer:    config.Title,