diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
index 0788594e3a..4cb533e86f 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/AuditRepository.cs
@@ -77,7 +77,8 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
         public IEnumerable<IAuditItem> Get(AuditType type, IQuery<IAuditItem> query)
         {
             var sqlClause = GetBaseQuery(false)
-                .Where<LogDto>(x => x.Header == type.ToString());
+                .Where("(logHeader=@0)", type.ToString());
+
             var translator = new SqlTranslator<IAuditItem>(sqlClause, query);
             var sql = translator.Translate();
 
diff --git a/src/Umbraco.Core/Services/Implement/AuditService.cs b/src/Umbraco.Core/Services/Implement/AuditService.cs
index 5eb08f2dea..7d3be1d52b 100644
--- a/src/Umbraco.Core/Services/Implement/AuditService.cs
+++ b/src/Umbraco.Core/Services/Implement/AuditService.cs
@@ -142,7 +142,7 @@ namespace Umbraco.Core.Services.Implement
             if (pageIndex < 0) throw new ArgumentOutOfRangeException(nameof(pageIndex));
             if (pageSize <= 0) throw new ArgumentOutOfRangeException(nameof(pageSize));
 
-            if (userId < 0)
+            if (userId < Constants.Security.SuperUserId)
             {
                 totalRecords = 0;
                 return Enumerable.Empty<IAuditItem>();