diff --git a/selfservice/strategy/link/token_recovery.go b/selfservice/strategy/link/token_recovery.go
index 84f527769262..37980d2a77d4 100644
--- a/selfservice/strategy/link/token_recovery.go
+++ b/selfservice/strategy/link/token_recovery.go
@@ -46,7 +46,7 @@ type RecoveryToken struct {
 	// UpdatedAt is a helper struct field for gobuffalo.pop.
 	UpdatedAt time.Time `json:"-" faker:"-" db:"updated_at"`
 	// RecoveryAddressID is a helper struct field for gobuffalo.pop.
-	RecoveryAddressID uuid.UUID `json:"-" faker:"-" db:"identity_recovery_address_id"`
+	RecoveryAddressID *uuid.UUID `json:"-" faker:"-" db:"identity_recovery_address_id"`
 	// FlowID is a helper struct field for gobuffalo.pop.
 	FlowID     uuid.NullUUID `json:"-" faker:"-" db:"selfservice_recovery_flow_id"`
 	NID        uuid.UUID     `json:"-"  faker:"-" db:"nid"`
@@ -73,7 +73,7 @@ func NewSelfServiceRecoveryToken(address *identity.RecoveryAddress, f *recovery.
 		IssuedAt:          now,
 		IdentityID:        identityID,
 		FlowID:            uuid.NullUUID{UUID: f.ID, Valid: true},
-		RecoveryAddressID: recoveryAddressID,
+		RecoveryAddressID: &recoveryAddressID,
 	}
 }