diff --git a/common/keydb/postgres/keydb.go b/common/keydb/postgres/keydb.go
index 706ca005..a8a30437 100644
--- a/common/keydb/postgres/keydb.go
+++ b/common/keydb/postgres/keydb.go
@@ -17,7 +17,7 @@ package postgres
 
 import (
 	"context"
-	"math"
+	"time"
 
 	"golang.org/x/crypto/ed25519"
 
@@ -62,7 +62,7 @@ func NewDatabase(
 		VerifyKey: gomatrixserverlib.VerifyKey{
 			Key: gomatrixserverlib.Base64String(serverKey),
 		},
-		ValidUntilTS: math.MaxUint64 >> 1,
+		ValidUntilTS: gomatrixserverlib.AsTimestamp(time.Now().Add(100 * 365 * 24 * time.Hour)),
 		ExpiredTS:    gomatrixserverlib.PublicKeyNotExpired,
 	}
 	err = d.StoreKeys(
diff --git a/common/keydb/sqlite3/keydb.go b/common/keydb/sqlite3/keydb.go
index 94a32e29..1ff315d7 100644
--- a/common/keydb/sqlite3/keydb.go
+++ b/common/keydb/sqlite3/keydb.go
@@ -17,7 +17,7 @@ package sqlite3
 
 import (
 	"context"
-	"math"
+	"time"
 
 	"golang.org/x/crypto/ed25519"
 
@@ -63,7 +63,7 @@ func NewDatabase(
 		VerifyKey: gomatrixserverlib.VerifyKey{
 			Key: gomatrixserverlib.Base64String(serverKey),
 		},
-		ValidUntilTS: math.MaxUint64 >> 1,
+		ValidUntilTS: gomatrixserverlib.AsTimestamp(time.Now().Add(100 * 365 * 24 * time.Hour)),
 		ExpiredTS:    gomatrixserverlib.PublicKeyNotExpired,
 	}
 	err = d.StoreKeys(