diff --git a/src/lib/db/public-signup-token-store.ts b/src/lib/db/public-signup-token-store.ts
index ea76a45d34..b4fb152827 100644
--- a/src/lib/db/public-signup-token-store.ts
+++ b/src/lib/db/public-signup-token-store.ts
@@ -152,9 +152,9 @@ export class PublicSignupTokenStore implements IPublicSignupTokenStore {
     ): Promise<PublicSignupTokenSchema> {
         const response = await this.db<ITokenRow>(TABLE).insert(
             toRow(newToken),
-            ['*'],
+            ['secret'],
         );
-        return toTokens(response)[0];
+        return this.get(response[0].secret);
     }
 
     async isValid(secret: string): Promise<boolean> {