diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/events/api.svelte.ts b/src/Exceptionless.Web/ClientApp/src/lib/features/events/api.svelte.ts
index 99f95fdc8e..fbf7faa1d7 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/events/api.svelte.ts
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/events/api.svelte.ts
@@ -456,6 +456,7 @@ export function getOrganizationCountQuery(request: GetOrganizationCountRequest)
 
 export function getOrganizationEventsQuery(request: GetOrganizationEventsRequest) {
     return createQuery<FetchClientResponse<EventSummaryModel<SummaryTemplateKeys>[]>, ProblemDetails>(() => {
+        const requestEnabled = request.enabled?.() ?? true;
         const organizationId = request.route.organizationId;
         const params = request.params
             ? {
@@ -464,7 +465,7 @@ export function getOrganizationEventsQuery(request: GetOrganizationEventsRequest
             : undefined;
 
         return {
-            enabled: () => !!accessToken.current && !!organizationId && (request.enabled?.() ?? true),
+            enabled: () => !!accessToken.current && !!organizationId && requestEnabled,
             placeholderData: keepPreviousData,
             queryFn: async () => {
                 const client = useFetchClient();
diff --git a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
index e1543b9909..dba195af77 100644
--- a/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
+++ b/src/Exceptionless.Web/ClientApp/src/lib/features/product-tours/components/product-tour-host.svelte
@@ -99,7 +99,7 @@
         }
     });
     const errorEventAvailability = $derived.by((): ProductTourContext['errorEventAvailability'] => {
-        if (!organizationId || !catalogOpen || errorEventsQuery.isPending) {
+        if (!organizationId || !catalogOpen || errorEventsQuery.isPending || errorEventsQuery.isPlaceholderData) {
             return 'loading';
         }