diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json
index 3719df716e..3bf56ca420 100644
--- a/packages/components/package-lock.json
+++ b/packages/components/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@labkey/components",
-  "version": "7.58.4",
+  "version": "7.58.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@labkey/components",
-      "version": "7.58.4",
+      "version": "7.58.5",
       "license": "SEE LICENSE IN LICENSE.txt",
       "dependencies": {
         "@hello-pangea/dnd": "18.0.1",
diff --git a/packages/components/package.json b/packages/components/package.json
index 2debabedb2..edf2eb6e44 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@labkey/components",
-  "version": "7.58.4",
+  "version": "7.58.5",
   "description": "Components, models, actions, and utility functions for LabKey applications and pages",
   "sideEffects": false,
   "files": [
diff --git a/packages/components/src/internal/components/auditlog/constants.ts b/packages/components/src/internal/components/auditlog/constants.ts
index e0d373b972..4116b054e6 100644
--- a/packages/components/src/internal/components/auditlog/constants.ts
+++ b/packages/components/src/internal/components/auditlog/constants.ts
@@ -141,6 +141,13 @@ export const PLATE_SET_AUDIT_QUERY: AuditQuery = {
     value: 'PlateSetEvent',
 };
 
+// Events live in the root container, so the grid needs to look outside the current folder to find them
+export const SYSTEM_UPGRADE_AUDIT_QUERY: AuditQuery = {
+    containerFilter: Query.ContainerFilter.allFolders,
+    label: 'System Upgrade Events',
+    value: 'SystemUpgradeAuditEvent',
+};
+
 export const COMMON_AUDIT_QUERIES: AuditQuery[] = [
     ATTACHMENT_AUDIT_QUERY,
     DOMAIN_AUDIT_QUERY,
@@ -153,6 +160,7 @@ export const COMMON_AUDIT_QUERIES: AuditQuery[] = [
     QUERY_UPDATE_AUDIT_QUERY,
     SAMPLE_TYPE_AUDIT_QUERY,
     SAMPLE_TIMELINE_AUDIT_QUERY,
+    SYSTEM_UPGRADE_AUDIT_QUERY,
     USER_AUDIT_QUERY,
 ];
 
diff --git a/packages/components/src/internal/components/auditlog/utils.test.ts b/packages/components/src/internal/components/auditlog/utils.test.ts
index 529abb8ba3..98aca962fe 100644
--- a/packages/components/src/internal/components/auditlog/utils.test.ts
+++ b/packages/components/src/internal/components/auditlog/utils.test.ts
@@ -24,23 +24,25 @@ import {
     NOTEBOOK_REVIEW_AUDIT_QUERY,
     REGISTRY_AUDIT_QUERY,
     SOURCE_AUDIT_QUERY,
+    SYSTEM_UPGRADE_AUDIT_QUERY,
     WORKFLOW_AUDIT_QUERY,
 } from './constants';
 
 describe('getAuditQueries', () => {
     test('LKS starter', () => {
         const auditQueries = getAuditQueries(TEST_LKS_STARTER_MODULE_CONTEXT);
-        expect(auditQueries.length).toBe(15);
+        expect(auditQueries.length).toBe(16);
         expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
         expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
         expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(13);
+        expect(auditQueries.findIndex(entry => entry === SYSTEM_UPGRADE_AUDIT_QUERY)).toBe(14);
         expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBe(-1);
         expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
     });
 
     test('LKSM starter', () => {
         const auditQueries = getAuditQueries(TEST_LKSM_STARTER_MODULE_CONTEXT);
-        expect(auditQueries.length).toBe(13);
+        expect(auditQueries.length).toBe(14);
         expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(11);
         expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBe(-1);
         expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBe(-1);
@@ -50,7 +52,7 @@ describe('getAuditQueries', () => {
 
     test('LKSM professional', () => {
         const auditQueries = getAuditQueries(TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT);
-        expect(auditQueries.length).toBe(18);
+        expect(auditQueries.length).toBe(19);
         expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(15);
         expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
         expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
@@ -78,7 +80,7 @@ describe('getAuditQueries', () => {
             },
         };
         const auditQueries = getAuditQueries(moduleContext);
-        expect(auditQueries.length).toBe(19);
+        expect(auditQueries.length).toBe(20);
         expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(16);
         expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
         expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);