diff --git a/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs b/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
index 8cdc08d928..418c98786f 100644
--- a/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
+++ b/src/Infrastructure.EntityFramework/KeyManagement/Repositories/UserSigningKeysRepository.cs
@@ -40,7 +40,7 @@ public class UserSignatureKeyPairRepository : Repository<Core.KeyManagement.Enti
             var dbContext = GetDatabaseContext(scope);
             var entity = new Models.UserSignatureKeyPair
             {
-                Id = Guid.NewGuid(),
+                Id = CoreHelpers.GenerateComb(),
                 UserId = userId,
                 SignatureAlgorithm = signingKeys.SignatureAlgorithm,
                 SigningKey = signingKeys.WrappedSigningKey,