diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
index cc71797a5b..4f0e87f27f 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Auditing/AbpAuditingMiddleware.cs
@@ -33,23 +33,6 @@ namespace Volo.Abp.AspNetCore.Auditing
                 await next(context).ConfigureAwait(false);
                 return;
             }
-            if (Options.AlwaysLogOnException)
-            {
-                using (var scope = _auditingManager.BeginScope())
-                {
-                    try
-                    {
-                        await next(context).ConfigureAwait(false);
-                        return;
-                    }
-                    catch (Exception)
-                    {
-                        await scope.SaveAsync().ConfigureAwait(false);
-                        if (!Options.HideErrors)
-                            throw;
-                    }
-                }
-            }
 
             using (var scope = _auditingManager.BeginScope())
             {
@@ -59,6 +42,10 @@ namespace Volo.Abp.AspNetCore.Auditing
                 }
                 catch (Exception)
                 {
+                    if (!Options.HideErrors)
+                    {
+                        throw;
+                    }
                 }
                 finally
                 {
@@ -69,6 +56,11 @@ namespace Volo.Abp.AspNetCore.Auditing
 
         private bool ShouldWriteAuditLog(HttpContext httpContext)
         {
+            if (Options.AlwaysLogOnException)
+            {
+                return true;
+            }
+
             if (!Options.IsEnabled)
             {
                 return false;
diff --git a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs
index b65f8eef1f..1f81118e03 100644
--- a/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Auditing/AuditTestController_Tests.cs
@@ -40,6 +40,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Auditing
         {
             _options.IsEnabled = false;
             _options.AlwaysLogOnException = false;
+            _options.HideErrors = false;
             await GetResponseAsync("api/audit-test/audit-fail", System.Net.HttpStatusCode.BadRequest);
             //await _auditingStore.Received().SaveAsync(Arg.Any<AuditLogInfo>()); //Won't work, save happens out of scope
         }