diff --git a/frontend/src/core/hooks/useAuditFilters.ts b/frontend/src/core/hooks/useAuditFilters.ts
index ef8f0c7df..b650c3491 100644
--- a/frontend/src/core/hooks/useAuditFilters.ts
+++ b/frontend/src/core/hooks/useAuditFilters.ts
@@ -4,7 +4,7 @@ import auditService, { AuditFilters } from '@app/services/auditService';
 /**
  * Shared hook for managing audit filters across components
  */
-export function useAuditFilters(initialFilters: Partial<AuditFilters> = {}) {
+export function useAuditFilters(initialFilters: Partial<AuditFilters> = {}, loginEnabled: boolean = true) {
   const [eventTypes, setEventTypes] = useState<string[]>([]);
   const [users, setUsers] = useState<string[]>([]);
   const [filters, setFilters] = useState<AuditFilters>({
@@ -30,8 +30,10 @@ export function useAuditFilters(initialFilters: Partial<AuditFilters> = {}) {
       }
     };
 
-    fetchMetadata();
-  }, []);
+    if (loginEnabled) {
+      fetchMetadata();
+    }
+  }, [loginEnabled]);
 
   const handleFilterChange = (key: keyof AuditFilters, value: any) => {
     setFilters((prev) => ({ ...prev, [key]: value }));
diff --git a/frontend/src/proprietary/components/shared/config/configSections/audit/AuditEventsTable.tsx b/frontend/src/proprietary/components/shared/config/configSections/audit/AuditEventsTable.tsx
index adad94388..d8bf714b0 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/audit/AuditEventsTable.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/audit/AuditEventsTable.tsx
@@ -35,7 +35,7 @@ const AuditEventsTable: React.FC<AuditEventsTableProps> = ({ loginEnabled = true
   const { filters, eventTypes, users, handleFilterChange, handleClearFilters } = useAuditFilters({
     page: 0,
     pageSize: 20,
-  });
+  }, loginEnabled);
 
   useEffect(() => {
     const fetchEvents = async () => {
diff --git a/frontend/src/proprietary/components/shared/config/configSections/audit/AuditExportSection.tsx b/frontend/src/proprietary/components/shared/config/configSections/audit/AuditExportSection.tsx
index 2b4e533f3..04cc260e9 100644
--- a/frontend/src/proprietary/components/shared/config/configSections/audit/AuditExportSection.tsx
+++ b/frontend/src/proprietary/components/shared/config/configSections/audit/AuditExportSection.tsx
@@ -23,7 +23,7 @@ const AuditExportSection: React.FC<AuditExportSectionProps> = ({ loginEnabled =
   const [exporting, setExporting] = useState(false);
 
   // Use shared filters hook
-  const { filters, eventTypes, users, handleFilterChange, handleClearFilters } = useAuditFilters();
+  const { filters, eventTypes, users, handleFilterChange, handleClearFilters } = useAuditFilters({}, loginEnabled);
 
   const handleExport = async () => {
     if (!loginEnabled) return;