diff --git a/src/bundles/Elsa.AllInOne.Web/Program.cs b/src/bundles/Elsa.AllInOne.Web/Program.cs
index 65882fb97..34bb996b9 100644
--- a/src/bundles/Elsa.AllInOne.Web/Program.cs
+++ b/src/bundles/Elsa.AllInOne.Web/Program.cs
@@ -17,6 +17,7 @@ var identityTokenSection = identitySection.GetSection("Tokens");
 // Add Elsa services.
 services
     .AddElsa(elsa => elsa
+        .UseSasTokens()
         .UseIdentity(identity =>
         {
             identity.IdentityOptions = options => identitySection.Bind(options);
diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/Endpoint.cs
index 79a6016f0..7c0920cb4 100644
--- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/Endpoint.cs
+++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/Endpoint.cs
@@ -114,7 +114,7 @@ internal class Execute : ElsaEndpoint<Request, Response>
 
     private async Task HandleFaultAsync(WorkflowState workflowState, CancellationToken cancellationToken)
     {
-        var faultedResponse = _apiSerializer.Serialize(workflowState);
+        var faultedResponse = _apiSerializer.Serialize(new Response(workflowState));
 
         HttpContext.Response.ContentType = MediaTypeNames.Application.Json;
         HttpContext.Response.StatusCode = StatusCodes.Status500InternalServerError;