diff --git a/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs b/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs
index 0933997c..945f1ac7 100644
--- a/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs
+++ b/EnvelopeGenerator.Infrastructure/Executor/EnvelopeExecutor.cs
@@ -23,9 +23,9 @@ public class EnvelopeExecutor : SQLExecutor, IEnvelopeExecutor
     {
         using var connection = new SqlConnection(Params.ConnectionString);
         var sql = Provider.GetRequiredService<EnvelopeCreateReadSQL>();
+        var formattedSql = string.Format(sql.Raw, userId.ToSqlParam(), title.ToSqlParam(), tfaEnabled.ToSqlParam(), message.ToSqlParam());
         await connection.OpenAsync(cancellation);
-        var parameters = EnvelopeCreateReadSQL.CreateParmas(userId, title, message, tfaEnabled);
-        var envelopes = await connection.QueryAsync<Envelope>(sql.Raw, parameters);
+        var envelopes = await connection.QueryAsync<Envelope>(formattedSql);
         var envelope = envelopes.FirstOrDefault()
             ?? throw new InvalidOperationException($"Envelope creation failed. Parameters:" +
             $"userId={userId}, title='{title}', message='{message}', tfaEnabled={tfaEnabled}."); ;