diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx
index 1a313181ce13d..09612c9fa90d0 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx
@@ -163,7 +163,7 @@ const AppDetailsPage = ({ id }: AppDetailsPageProps): ReactElement => {
 			</Page>
 			{compactMode && contextualBar === 'filter-logs' && (
 				<FormProvider {...logsFilterFormMethods}>
-					<AppLogsFilterContextualBar onClose={handleReturnToLogs} />
+					<AppLogsFilterContextualBar appId={id} onClose={handleReturnToLogs} />
 				</FormProvider>
 			)}
 		</Page>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
index ddc18e540216f..81b620dc237b6 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -1,5 +1,4 @@
 import { Box, Pagination } from '@rocket.chat/fuselage';
-import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useMemo, type ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -23,15 +22,13 @@ const AppLogs = ({ id }: { id: string }): ReactElement => {
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 
-	const debouncedEvent = useDebouncedValue(event, 500);
-
 	const { data, isSuccess, isError, error, isFetching } = useLogs({
 		appId: id,
 		current,
 		itemsPerPage,
 		...(instance !== 'all' && { instanceId: instance }),
 		...(severity !== 'all' && { logLevel: severity }),
-		method: debouncedEvent,
+		...(event !== 'all' && { method: event }),
 		...(startTime && startDate && { startDate: new Date(`${startDate}T${startTime}`).toISOString() }),
 		...(endTime && endDate && { endDate: new Date(`${endDate}T${endTime}`).toISOString() }),
 	});
@@ -50,14 +47,14 @@ const AppLogs = ({ id }: { id: string }): ReactElement => {
 	return (
 		<>
 			<Box pb={16}>
-				<AppLogsFilter noResults={isFetching || !isSuccess || data?.logs?.length === 0} isLoading={isFetching} />
+				<AppLogsFilter appId={id} noResults={isFetching || !isSuccess || data?.logs?.length === 0} isLoading={isFetching} />
 			</Box>
 			{isFetching && <AccordionLoading />}
 			{isError && <GenericError title={parsedError} />}
 			{!isFetching && isSuccess && data?.logs?.length === 0 && <GenericNoResults />}
 			{!isFetching && isSuccess && data?.logs?.length > 0 && (
 				<CustomScrollbars>
-					<CollapsiblePanel aria-busy={isFetching || event !== debouncedEvent} width='100%' alignSelf='center'>
+					<CollapsiblePanel aria-busy={isFetching} width='100%' alignSelf='center'>
 						{data?.logs?.map((log, index) => <AppLogsItem regionId={log._id} key={`${index}-${log._createdAt}`} {...log} />)}
 					</CollapsiblePanel>
 				</CustomScrollbars>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.stories.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.stories.tsx
index 4bfe63bb6b34b..09ae4a97e3a42 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.stories.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.stories.tsx
@@ -12,10 +12,10 @@ export default {
 	args: {},
 	decorators: [
 		mockAppRoot()
-			// @ts-expect-error The endpoint is to be merged in https://github.com/RocketChat/Rocket.Chat/pull/36245
-			.withEndpoint('GET', '/apps/logs/instanceIds', () => ({
+			.withEndpoint('GET', '/apps/:id/logs/distinctValues', () => ({
 				success: true,
 				instanceIds: ['instance-1', 'instance-2', 'instance-3'],
+				methods: ['method-1', 'method-2', 'method-3'],
 			}))
 			.buildStoryDecorator(),
 		(fn) => {
@@ -33,4 +33,4 @@ export default {
 	},
 } satisfies Meta<typeof AppLogsFilter>;
 
-export const Default = () => <AppLogsFilter />;
+export const Default = () => <AppLogsFilter appId='app-id' />;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
index 6622ec0add02b..703e959c5e2d1 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilter.tsx
@@ -1,9 +1,10 @@
-import { Box, Button, Icon, IconButton, Label, Palette, TextInput } from '@rocket.chat/fuselage';
+import { Box, Button, IconButton, Label } from '@rocket.chat/fuselage';
 import { useRouter, useSetModal } from '@rocket.chat/ui-contexts';
 import { Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import CompactFilterOptions from './AppsLogsFilterOptionsCompact';
+import { EventFilterSelect } from './EventFilterSelect';
 import { InstanceFilterSelect } from './InstanceFilterSelect';
 import { SeverityFilterSelect } from './SeverityFilterSelect';
 import { TimeFilterSelect } from './TimeFilterSelect';
@@ -12,11 +13,12 @@ import { useAppLogsFilterFormContext } from '../useAppLogsFilterForm';
 import { ExportLogsModal } from './ExportLogsModal';
 
 type AppsLogsFilterProps = {
+	appId: string;
 	isLoading?: boolean;
 	noResults?: boolean;
 };
 
-export const AppLogsFilter = ({ isLoading = false, noResults = false }: AppsLogsFilterProps) => {
+export const AppLogsFilter = ({ appId, isLoading = false, noResults = false }: AppsLogsFilterProps) => {
 	const { t } = useTranslation();
 
 	const { control, getValues } = useAppLogsFilterFormContext();
@@ -44,17 +46,13 @@ export const AppLogsFilter = ({ isLoading = false, noResults = false }: AppsLogs
 	return (
 		<Box display='flex' flexDirection='row' width='full' flexWrap='wrap' alignContent='flex-end'>
 			<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
-				<Label htmlFor='eventFilter'>{t('Event')}</Label>
+				<Label id='eventFilterLabel' htmlFor='eventFilter'>
+					{t('Event')}
+				</Label>
 				<Controller
 					control={control}
 					name='event'
-					render={({ field }) => (
-						<TextInput
-							addon={<Icon color={Palette.text['font-secondary-info']} name='magnifier' size={20} />}
-							id='eventFilter'
-							{...field}
-						/>
-					)}
+					render={({ field }) => <EventFilterSelect appId={appId} aria-labelledby='eventFilterLabel' id='eventFilter' {...field} />}
 				/>
 			</Box>
 			{!compactMode && (
@@ -73,7 +71,9 @@ export const AppLogsFilter = ({ isLoading = false, noResults = false }: AppsLogs
 					<Controller
 						control={control}
 						name='instance'
-						render={({ field }) => <InstanceFilterSelect aria-labelledby='instanceFilterLabel' id='instanceFilter' {...field} />}
+						render={({ field }) => (
+							<InstanceFilterSelect appId={appId} aria-labelledby='instanceFilterLabel' id='instanceFilter' {...field} />
+						)}
 					/>
 				</Box>
 			)}
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterCompact.spec.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterCompact.spec.tsx
index 9ca525a51febd..0be8a13c9dcae 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterCompact.spec.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterCompact.spec.tsx
@@ -19,7 +19,10 @@ test.each(testCases)(`renders AppLogsItem without crashing`, async (_storyname,
 test.each(testCases)('AppLogsItem should have no a11y violations', async (_storyname, Story) => {
 	const { container } = render(<Story />, { wrapper: mockAppRoot().build() });
 
-	const results = await axe(container);
+	/**
+	 ** Disable 'nested-interactive' rule because our `Select` component is still not a11y compliant
+	 **/
+	const results = await axe(container, { rules: { 'nested-interactive': { enabled: false } } });
 
 	expect(results).toHaveNoViolations();
 });
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx
index 23fa65fdbaff1..e6a9bd6e27645 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx
@@ -12,10 +12,10 @@ export default {
 	args: {},
 	decorators: [
 		mockAppRoot()
-			// @ts-expect-error The endpoint is to be merged in https://github.com/RocketChat/Rocket.Chat/pull/36245
-			.withEndpoint('GET', '/apps/logs/instanceIds', () => ({
+			.withEndpoint('GET', '/apps/:id/logs/distinctValues', () => ({
 				success: true,
 				instanceIds: ['instance-1', 'instance-2', 'instance-3'],
+				methods: ['method-1', 'method-2', 'method-3'],
 			}))
 			.buildStoryDecorator(),
 		(fn) => {
@@ -33,4 +33,4 @@ export default {
 	},
 } satisfies Meta<typeof AppLogsFilterContextualBar>;
 
-export const Default = () => <AppLogsFilterContextualBar onClose={action('onClose')} />;
+export const Default = () => <AppLogsFilterContextualBar appId='app-id' onClose={action('onClose')} />;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx
index f9802e3545bce..8f4f6222ce3a2 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx
@@ -17,10 +17,11 @@ import {
 import { useAppLogsFilterFormContext } from '../useAppLogsFilterForm';
 
 type AppLogsFilterContextualBarProps = {
+	appId: string;
 	onClose: () => void;
 };
 
-export const AppLogsFilterContextualBar = ({ onClose = () => undefined }: AppLogsFilterContextualBarProps) => {
+export const AppLogsFilterContextualBar = ({ appId, onClose = () => undefined }: AppLogsFilterContextualBarProps) => {
 	const { t } = useTranslation();
 
 	const { control } = useAppLogsFilterFormContext();
@@ -54,7 +55,9 @@ export const AppLogsFilterContextualBar = ({ onClose = () => undefined }: AppLog
 					<Controller
 						control={control}
 						name='instance'
-						render={({ field }) => <InstanceFilterSelect aria-labelledby='instanceFilterLabel' id='instanceFilter' {...field} />}
+						render={({ field }) => (
+							<InstanceFilterSelect appId={appId} aria-labelledby='instanceFilterLabel' id='instanceFilter' {...field} />
+						)}
 					/>
 				</Box>
 				<Box display='flex' flexDirection='column' mie={10} flexGrow={1}>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/EventFilterSelect.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/EventFilterSelect.tsx
new file mode 100644
index 0000000000000..1c2f0f33a2b3b
--- /dev/null
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/EventFilterSelect.tsx
@@ -0,0 +1,26 @@
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { InputBoxSkeleton, Select } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useLogsDistinctValues } from '../../../../hooks/useLogsDistinctValues';
+
+type EventFilterSelectProps = Omit<ComponentProps<typeof Select>, 'options'> & { appId: string };
+
+export const EventFilterSelect = ({ appId, ...props }: EventFilterSelectProps) => {
+	const { t } = useTranslation();
+
+	const { data, isPending } = useLogsDistinctValues(appId);
+
+	const options: SelectOption[] = useMemo(() => {
+		const mappedData: [string, string][] = data?.methods?.map((id: string) => [id, id]) || [];
+		return [['all', t('All')], ...mappedData];
+	}, [data, t]);
+
+	if (isPending) {
+		return <InputBoxSkeleton aria-labelledby={props['aria-labelledby']} aria-busy />;
+	}
+
+	return <Select options={options} {...props} />;
+};
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/InstanceFilterSelect.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/InstanceFilterSelect.tsx
index ea36d9034585e..14323201812b0 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/InstanceFilterSelect.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/InstanceFilterSelect.tsx
@@ -1,26 +1,19 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { InputBoxSkeleton, Select } from '@rocket.chat/fuselage';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
 import type { ComponentProps } from 'react';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-type InstanceFilterSelectProps = Omit<ComponentProps<typeof Select>, 'options'>;
+import { useLogsDistinctValues } from '../../../../hooks/useLogsDistinctValues';
 
-export const InstanceFilterSelect = ({ ...props }: InstanceFilterSelectProps) => {
+type InstanceFilterSelectProps = Omit<ComponentProps<typeof Select>, 'options'> & { appId: string };
+
+export const InstanceFilterSelect = ({ appId, ...props }: InstanceFilterSelectProps) => {
 	const { t } = useTranslation();
-	// @ts-expect-error The endpoint is to be merged in https://github.com/RocketChat/Rocket.Chat/pull/36245
-	const getOptions = useEndpoint('GET', '/apps/logs/instanceIds');
 
-	const { data, isPending } = useQuery({
-		queryKey: ['app-logs-filter-instances'],
-		// @ts-expect-error The endpoint is to be merged in https://github.com/RocketChat/Rocket.Chat/pull/36245
-		queryFn: async () => getOptions(),
-	});
+	const { data, isPending } = useLogsDistinctValues(appId);
 
 	const options: SelectOption[] = useMemo(() => {
-		// @ts-expect-error The endpoint is to be merged in https://github.com/RocketChat/Rocket.Chat/pull/36245
 		const mappedData: [string, string][] = data?.instanceIds?.map((id: string) => [id, id]) || [];
 		return [['all', t('All')], ...mappedData];
 	}, [data, t]);
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
index d961a55584c29..fc4fd37a8c3eb 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterCompact.spec.tsx.snap
@@ -15,31 +15,19 @@ exports[`renders AppLogsItem without crashing 1`] = `
           <label
             class="rcx-box rcx-box--full rcx-label"
             for="eventFilter"
+            id="eventFilterLabel"
           >
             Event
           </label>
-          <label
-            class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+          <div
+            aria-busy="true"
+            aria-labelledby="eventFilterLabel"
+            class="rcx-box rcx-box--full rcx-skeleton__input"
           >
-            <input
-              class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
-              id="eventFilter"
-              name="event"
-              size="1"
-              type="text"
-              value=""
-            />
             <span
-              class="rcx-box rcx-box--full rcx-input-box__addon"
-            >
-              <i
-                aria-hidden="true"
-                class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-1bepdyv"
-              >
-                
-              </i>
-            </span>
-          </label>
+              class="rcx-skeleton rcx-skeleton--text rcx-css-1qcz93u"
+            />
+          </div>
         </div>
         <button
           class="rcx-box rcx-box--full rcx-button--secondary rcx-button rcx-css-qv9v2f"
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
index 0a1b43163c9fa..c2d86bd0912c5 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/__snapshots__/AppLogsFilterExpanded.spec.tsx.snap
@@ -15,31 +15,19 @@ exports[`renders AppLogsItem without crashing 1`] = `
           <label
             class="rcx-box rcx-box--full rcx-label"
             for="eventFilter"
+            id="eventFilterLabel"
           >
             Event
           </label>
-          <label
-            class="rcx-box rcx-box--full rcx-label rcx-box rcx-box--full rcx-box--animated rcx-input-box__wrapper"
+          <div
+            aria-busy="true"
+            aria-labelledby="eventFilterLabel"
+            class="rcx-box rcx-box--full rcx-skeleton__input"
           >
-            <input
-              class="rcx-box rcx-box--full rcx-box--animated rcx-input-box--undecorated rcx-input-box--type-text rcx-input-box"
-              id="eventFilter"
-              name="event"
-              size="1"
-              type="text"
-              value=""
-            />
             <span
-              class="rcx-box rcx-box--full rcx-input-box__addon"
-            >
-              <i
-                aria-hidden="true"
-                class="rcx-box rcx-box--full rcx-icon--name-magnifier rcx-icon rcx-css-1bepdyv"
-              >
-                
-              </i>
-            </span>
-          </label>
+              class="rcx-skeleton rcx-skeleton--text rcx-css-1qcz93u"
+            />
+          </div>
         </div>
         <div
           class="rcx-box rcx-box--full rcx-css-1rfw4fq"
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/useAppLogsFilterForm.ts b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/useAppLogsFilterForm.ts
index 4f82c4a293de0..ef9e319ab8edb 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/useAppLogsFilterForm.ts
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/useAppLogsFilterForm.ts
@@ -12,6 +12,6 @@ export type AppLogsFilterFormData = {
 };
 
 export const useAppLogsFilterForm = () =>
-	useForm<AppLogsFilterFormData>({ defaultValues: { severity: 'all', instance: 'all', timeFilter: 'all' } });
+	useForm<AppLogsFilterFormData>({ defaultValues: { severity: 'all', instance: 'all', timeFilter: 'all', event: 'all' } });
 
 export const useAppLogsFilterFormContext = () => useFormContext<AppLogsFilterFormData>();
diff --git a/apps/meteor/client/views/marketplace/hooks/useLogsDistinctValues.ts b/apps/meteor/client/views/marketplace/hooks/useLogsDistinctValues.ts
new file mode 100644
index 0000000000000..1ef253ba2a90a
--- /dev/null
+++ b/apps/meteor/client/views/marketplace/hooks/useLogsDistinctValues.ts
@@ -0,0 +1,13 @@
+import type { OperationResult } from '@rocket.chat/rest-typings';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import type { UseQueryResult } from '@tanstack/react-query';
+import { useQuery } from '@tanstack/react-query';
+
+export const useLogsDistinctValues = (appId: string): UseQueryResult<OperationResult<'GET', '/apps/:id/logs/distinctValues'>> => {
+	const getValues = useEndpoint('GET', '/apps/:id/logs/distinctValues', { id: appId });
+
+	return useQuery({
+		queryKey: ['app-logs-filter-distinct-values', appId],
+		queryFn: async () => getValues(),
+	});
+};
diff --git a/apps/meteor/ee/server/apps/communication/endpoints/appLogsDistinctInstanceHandler.ts b/apps/meteor/ee/server/apps/communication/endpoints/appLogsDistinctInstanceHandler.ts
new file mode 100644
index 0000000000000..e45a95af9b5bd
--- /dev/null
+++ b/apps/meteor/ee/server/apps/communication/endpoints/appLogsDistinctInstanceHandler.ts
@@ -0,0 +1,62 @@
+import { ajv } from '@rocket.chat/rest-typings';
+
+import type { AppsRestApi } from '../rest';
+
+// This might be a good candidate for a default validator function exported by @rocket.chat/rest-typings
+const errorResponse = ajv.compile<unknown>({
+	additionalProperties: false,
+	type: 'object',
+	properties: {
+		error: {
+			type: 'string',
+		},
+		status: {
+			type: 'string',
+			nullable: true,
+		},
+		message: {
+			type: 'string',
+			nullable: true,
+		},
+		success: {
+			type: 'boolean',
+			description: 'Indicates if the request was successful.',
+		},
+	},
+	required: ['success', 'error'],
+});
+
+export const registerAppLogsDistinctInstanceHandler = ({ api, _orch }: AppsRestApi) =>
+	void api.get(
+		':id/logs/distinctValues',
+		{
+			authRequired: true,
+			permissionsRequired: ['manage-apps'],
+			response: {
+				200: ajv.compile({
+					type: 'object',
+					properties: {
+						instanceIds: { type: 'array', items: { type: 'string' } },
+						methods: { type: 'array', items: { type: 'string' } },
+						success: { type: 'boolean' },
+					},
+					required: ['instanceIds', 'methods', 'success'],
+					additionalProperties: false,
+				}),
+				401: errorResponse,
+				403: errorResponse,
+				404: errorResponse,
+			},
+		},
+		async function action() {
+			const app = await _orch.getManager()?.getOneById(this.urlParams.id);
+
+			if (!app) {
+				return api.notFound(`No app found with id: ${this.urlParams.id}`);
+			}
+
+			const result = await _orch.getLogStorage().distinctValues(this.urlParams.id);
+
+			return api.success(result);
+		},
+	);
diff --git a/apps/meteor/ee/server/apps/communication/endpoints/lib/makeAppLogsQuery.ts b/apps/meteor/ee/server/apps/communication/endpoints/lib/makeAppLogsQuery.ts
index 1d8097903ec9f..092c12a81ec3c 100644
--- a/apps/meteor/ee/server/apps/communication/endpoints/lib/makeAppLogsQuery.ts
+++ b/apps/meteor/ee/server/apps/communication/endpoints/lib/makeAppLogsQuery.ts
@@ -36,6 +36,10 @@ export function makeAppLogsQuery(queryParams: AppLogsProps) {
 		query.method = queryParams.method;
 	}
 
+	if (queryParams.instanceId) {
+		query.instanceId = queryParams.instanceId;
+	}
+
 	if (queryParams.startDate) {
 		query._updatedAt = {
 			$gte: new Date(queryParams.startDate),
@@ -44,7 +48,6 @@ export function makeAppLogsQuery(queryParams: AppLogsProps) {
 
 	if (queryParams.endDate) {
 		const endDate = new Date(queryParams.endDate);
-		endDate.setDate(endDate.getDate() + 1);
 
 		if (query._updatedAt?.$gte && query._updatedAt.$gte >= endDate) {
 			throw new Error('Invalid date range');
diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
index dac6fe272f6a7..6a6809a1b5216 100644
--- a/apps/meteor/ee/server/apps/communication/rest.ts
+++ b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -11,6 +11,12 @@ import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import { Meteor } from 'meteor/meteor';
 import { ZodError } from 'zod';
 
+import { registerActionButtonsHandler } from './endpoints/actionButtonsHandler';
+import { registerAppGeneralLogsHandler } from './endpoints/appGeneralLogsHandler';
+import { registerAppLogsDistinctInstanceHandler } from './endpoints/appLogsDistinctInstanceHandler';
+import { registerAppLogsExportHandler } from './endpoints/appLogsExportHandler';
+import { registerAppLogsHandler } from './endpoints/appLogsHandler';
+import { registerAppsCountHandler } from './endpoints/appsCountHandler';
 import { API } from '../../../../app/api/server';
 import type { APIClass } from '../../../../app/api/server/ApiClass';
 import { getUploadFormData } from '../../../../app/api/server/lib/getUploadFormData';
@@ -34,11 +40,6 @@ import { fetchMarketplaceCategories } from '../marketplace/fetchMarketplaceCateg
 import { MarketplaceAppsError, MarketplaceConnectionError, MarketplaceUnsupportedVersionError } from '../marketplace/marketplaceErrors';
 import type { AppServerOrchestrator } from '../orchestrator';
 import { Apps } from '../orchestrator';
-import { registerActionButtonsHandler } from './endpoints/actionButtonsHandler';
-import { registerAppGeneralLogsHandler } from './endpoints/appGeneralLogsHandler';
-import { registerAppLogsExportHandler } from './endpoints/appLogsExportHandler';
-import { registerAppLogsHandler } from './endpoints/appLogsHandler';
-import { registerAppsCountHandler } from './endpoints/appsCountHandler';
 
 const rocketChatVersion = Info.version;
 const appsEngineVersionForMarketplace = Info.marketplaceApiVersion.replace(/-.*/g, '');
@@ -109,6 +110,7 @@ export class AppsRestApi {
 		registerActionButtonsHandler(this);
 		registerAppsCountHandler(this);
 
+		registerAppLogsDistinctInstanceHandler(this);
 		registerAppLogsHandler(this);
 		registerAppLogsExportHandler(this);
 		registerAppGeneralLogsHandler(this);
diff --git a/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts b/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts
index 82fbf49a5ebc6..62f61699f2e47 100644
--- a/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts
+++ b/apps/meteor/ee/server/apps/storage/AppRealLogStorage.ts
@@ -34,6 +34,10 @@ export class AppRealLogStorage extends AppLogStorage {
 		};
 	}
 
+	async distinctValues(appId: string) {
+		return this.db.getDistinctFieldsForFilters(appId);
+	}
+
 	async storeEntries(logEntry: ILoggerStorageEntry): Promise<ILoggerStorageEntry> {
 		logEntry.instanceId = InstanceStatus.id();
 
diff --git a/apps/meteor/ee/tests/unit/server/apps/endpoints/lib/makeAppLogsQuery.spec.ts b/apps/meteor/ee/tests/unit/server/apps/endpoints/lib/makeAppLogsQuery.spec.ts
index 2660f9422c997..5536430c7976a 100644
--- a/apps/meteor/ee/tests/unit/server/apps/endpoints/lib/makeAppLogsQuery.spec.ts
+++ b/apps/meteor/ee/tests/unit/server/apps/endpoints/lib/makeAppLogsQuery.spec.ts
@@ -46,6 +46,15 @@ describe('makeAppLogsQuery', () => {
 		});
 	});
 
+	it('should include instanceId filter when instanceId is provided', () => {
+		const queryParams: AppLogsProps = { instanceId: 'instance123' };
+		const result = makeAppLogsQuery(queryParams);
+
+		expect(result).to.deep.equal({
+			instanceId: 'instance123',
+		});
+	});
+
 	it('should include start date filter when startDate is provided', () => {
 		const startDate = '2024-01-01T00:00:00.000Z';
 		const queryParams: AppLogsProps = { startDate };
@@ -64,7 +73,6 @@ describe('makeAppLogsQuery', () => {
 		const result = makeAppLogsQuery(queryParams);
 
 		const expectedEndDate = new Date(endDate);
-		expectedEndDate.setDate(expectedEndDate.getDate() + 1);
 
 		expect(result).to.deep.equal({
 			_updatedAt: {
@@ -80,7 +88,6 @@ describe('makeAppLogsQuery', () => {
 		const result = makeAppLogsQuery(queryParams);
 
 		const expectedEndDate = new Date(endDate);
-		expectedEndDate.setDate(expectedEndDate.getDate() + 1);
 
 		expect(result).to.deep.equal({
 			_updatedAt: {
@@ -104,11 +111,11 @@ describe('makeAppLogsQuery', () => {
 			method: 'app:construct',
 			startDate: '2024-01-01T00:00:00.000Z',
 			endDate: '2024-01-02T00:00:00.000Z',
+			instanceId: 'instance123',
 		};
 		const result = makeAppLogsQuery(queryParams);
 
 		const expectedEndDate = new Date(queryParams.endDate as string);
-		expectedEndDate.setDate(expectedEndDate.getDate() + 1);
 
 		expect(result).to.deep.equal({
 			'entries.severity': { $in: ['error', 'warn', 'info', 'log'] },
@@ -117,6 +124,7 @@ describe('makeAppLogsQuery', () => {
 				$gte: new Date(queryParams.startDate as string),
 				$lte: expectedEndDate,
 			},
+			'instanceId': 'instance123',
 		});
 	});
 });
diff --git a/apps/meteor/tests/end-to-end/apps/app-logs-distinct-values.ts b/apps/meteor/tests/end-to-end/apps/app-logs-distinct-values.ts
new file mode 100644
index 0000000000000..34683429bce2b
--- /dev/null
+++ b/apps/meteor/tests/end-to-end/apps/app-logs-distinct-values.ts
@@ -0,0 +1,109 @@
+import { expect } from 'chai';
+import { after, before, describe, it } from 'mocha';
+
+import { getCredentials, request, credentials } from '../../data/api-data';
+import { apps } from '../../data/apps/apps-data';
+import { installTestApp, cleanupApps } from '../../data/apps/helper';
+import { updatePermission } from '../../data/permissions.helper';
+import { IS_EE } from '../../e2e/config/constants';
+
+(IS_EE ? describe : describe.skip)('Apps - Logs Distinct Values', () => {
+	let appId: string;
+
+	before((done) => getCredentials(done));
+
+	before(async () => {
+		await cleanupApps();
+		const app = await installTestApp();
+		appId = app.id;
+	});
+
+	after(() => Promise.all([cleanupApps(), updatePermission('manage-apps', ['admin'])]));
+
+	it('should return distinct values successfully', (done) => {
+		void request
+			.get(apps(`/${appId}/logs/distinctValues`))
+			.set(credentials)
+			.expect(200)
+			.expect('Content-Type', 'application/json')
+			.expect((res) => {
+				expect(res.body).to.have.a.property('success', true);
+				expect(res.body).to.have.a.property('instanceIds').that.is.an('array');
+				expect(res.body).to.have.a.property('methods').that.is.an('array');
+
+				const { instanceIds, methods } = res.body;
+				const uniqueInstanceIds = new Set(instanceIds);
+				const uniqueMethods = new Set(methods);
+
+				// All instance IDs should be unique
+				expect(instanceIds).to.have.lengthOf(uniqueInstanceIds.size);
+
+				// All methods should be unique
+				expect(methods).to.have.lengthOf(uniqueMethods.size);
+			})
+			.end(done);
+	});
+
+	it('should require authentication', (done) => {
+		void request
+			.get(apps(`/${appId}/logs/distinctValues`))
+			.expect(401)
+			.expect('Content-Type', 'application/json')
+			.expect((res) => {
+				expect(res.body).to.have.a.property('success', false);
+				expect(res.body).to.have.a.property('error');
+			})
+			.end(done);
+	});
+
+	it('should require manage-apps permission', (done) => {
+		void updatePermission('manage-apps', []).then(
+			() =>
+				void request
+					.get(apps(`/${appId}/logs/distinctValues`))
+					.set(credentials)
+					.expect(403)
+					.expect('Content-Type', 'application/json')
+					.expect((res) => {
+						expect(res.body).to.have.a.property('success', false);
+					})
+					// Doing the `updatePermission` call here pollutes the error reporting, but we shouldn't call `done` before doing it.
+					.end((err) => void updatePermission('manage-apps', ['admin']).then(() => void done(err))),
+		);
+	});
+
+	it('should return 404 for non-existent app', (done) => {
+		void request
+			.get(apps('/non-existent-app-id/logs/distinctValues'))
+			.set(credentials)
+			.expect(404)
+			.expect('Content-Type', 'application/json')
+			.expect((res) => {
+				expect(res.body).to.have.a.property('success', false);
+				expect(res.body).to.have.a.property('error');
+			})
+			.end(done);
+	});
+
+	it('should return empty arrays when no logs exist', (done) => {
+		// Clean up all apps first to ensure no logs
+		void cleanupApps().then(async () => {
+			// Install a fresh app
+			const app = await installTestApp();
+			void request
+				.get(apps(`/${app.id}/logs/distinctValues`))
+				.set(credentials)
+				.expect(200)
+				.expect('Content-Type', 'application/json')
+				.expect((res) => {
+					expect(res.body).to.have.a.property('success', true);
+					expect(res.body).to.have.a.property('instanceIds').that.is.an('array');
+					expect(res.body).to.have.a.property('methods').that.is.an('array');
+					// Could be empty or have values from other tests
+					expect(res.body.instanceIds).to.satisfy((arr: any[]) => Array.isArray(arr));
+					expect(res.body.methods).to.satisfy((arr: any[]) => Array.isArray(arr));
+				})
+				.end(done);
+		});
+	});
+});
diff --git a/packages/model-typings/src/models/IAppLogsModel.ts b/packages/model-typings/src/models/IAppLogsModel.ts
index 0ff8ae0a00cf5..5ad5f1b8732ba 100644
--- a/packages/model-typings/src/models/IAppLogsModel.ts
+++ b/packages/model-typings/src/models/IAppLogsModel.ts
@@ -5,4 +5,5 @@ import type { IBaseModel } from './IBaseModel';
 // TODO: type for AppLogs
 export interface IAppLogsModel extends IBaseModel<any> {
 	remove(query: Filter<any>): Promise<DeleteResult>;
+	getDistinctFieldsForFilters(appId: string): Promise<{ instanceIds: string[]; methods: string[] }>;
 }
diff --git a/packages/models/src/models/AppLogsModel.ts b/packages/models/src/models/AppLogsModel.ts
index 2d693a78f885d..4447e4d716b6c 100644
--- a/packages/models/src/models/AppLogsModel.ts
+++ b/packages/models/src/models/AppLogsModel.ts
@@ -23,22 +23,39 @@ export class AppsLogsModel extends BaseRaw<any> implements IAppLogsModel {
 					'appId': 1,
 					'_updatedAt': -1,
 					'entries.severity': 1,
+					'instanceId': 1,
 					'method': 1,
 				},
-				name: 'appId_indexed_query',
+				name: 'appId_indexed_query_v2',
 			},
 			// Index for queries on general logs endpoint
 			{
 				key: {
 					'_updatedAt': -1,
 					'entries.severity': 1,
+					'instanceId': 1,
 					'method': 1,
 				},
-				name: 'general_logs_index',
+				name: 'general_logs_index_v2',
 			},
 		];
 	}
 
+	async getDistinctFieldsForFilters(appId: string): Promise<{ instanceIds: string[]; methods: string[] }> {
+		/**
+		 * The following aggregation uses the 'appId_indexed_query_v2' index to retrieve the distinct values
+		 * The execution is fully covered by the index, meaning the database should not need to scan any documents.
+		 */
+		const [{ instanceIds, methods }] = await this.col
+			.aggregate([
+				{ $match: { appId } },
+				{ $group: { _id: null, instanceIds: { $addToSet: '$instanceId' }, methods: { $addToSet: '$method' } } },
+			])
+			.toArray();
+
+		return { instanceIds, methods };
+	}
+
 	remove(query: Filter<any>): Promise<DeleteResult> {
 		return this.col.deleteMany(query);
 	}
diff --git a/packages/rest-typings/src/apps/appLogsProps.ts b/packages/rest-typings/src/apps/appLogsProps.ts
index 6b1220fe8f528..83518f448a6c3 100644
--- a/packages/rest-typings/src/apps/appLogsProps.ts
+++ b/packages/rest-typings/src/apps/appLogsProps.ts
@@ -4,6 +4,7 @@ import { ajv } from '../v1/Ajv';
 export type AppLogsProps = PaginatedRequest<{
 	appId?: string;
 	logLevel?: '0' | '1' | '2';
+	instanceId?: string;
 	method?: string;
 	startDate?: string;
 	endDate?: string;
@@ -14,6 +15,7 @@ const AppLogsPropsSchema = {
 	properties: {
 		appId: { type: 'string', nullable: true },
 		logLevel: { type: 'string', enum: ['0', '1', '2'], nullable: true },
+		instanceId: { type: 'string', nullable: true },
 		method: { type: 'string', nullable: true },
 		startDate: { type: 'string', format: 'date-time', nullable: true },
 		endDate: { type: 'string', format: 'date-time', nullable: true },
diff --git a/packages/rest-typings/src/apps/index.ts b/packages/rest-typings/src/apps/index.ts
index d6000eae61e91..615cb0b9a2dc2 100644
--- a/packages/rest-typings/src/apps/index.ts
+++ b/packages/rest-typings/src/apps/index.ts
@@ -108,6 +108,10 @@ export type AppsEndpoints = {
 		}>;
 	};
 
+	'/apps/:id/logs/distinctValues': {
+		GET: () => { success: boolean; instanceIds: string[]; methods: string[] };
+	};
+
 	'/apps/:id/export-logs': {
 		GET: (params: AppLogsExportProps) => Buffer;
 	};