diff --git a/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts b/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts
index ecd4227a54b655..2fce7f8f5e825e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts
@@ -78,8 +78,8 @@ export const pagePathGetters: {
     `/policies/${policyId}/edit-integration/${packagePolicyId}`,
   fleet: () => '/fleet',
   fleet_agent_list: ({ kuery }) => `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`,
-  fleet_agent_details: ({ agentId, tabId }) =>
-    `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}`,
+  fleet_agent_details: ({ agentId, tabId, logQuery }) =>
+    `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}${logQuery ? `?_q=${logQuery}` : ''}`,
   fleet_enrollment_tokens: () => '/fleet/enrollment-tokens',
   data_streams: () => '/data-streams',
 };
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx
index 146e0698719c62..6e989b6c9f7bd4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/agent_details_integrations.tsx
@@ -75,10 +75,11 @@ export const AgentDetailsIntegration: React.FunctionComponent<{
       render: (inputType: string) => {
         return (
           <EuiButtonIcon
-            href={`${getHref('fleet_agent_details', {
+            href={getHref('fleet_agent_details', {
               agentId: agent.id,
               tabId: 'logs',
-            })}?${getLogsQueryByInputType(inputType)}`}
+              logQuery: getLogsQueryByInputType(inputType),
+            })}
             iconType="editorAlignLeft"
             title={i18n.translate('xpack.fleet.agentDetailsIntegrations.viewLogsButton', {
               defaultMessage: 'View logs',
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/input_type_utils.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/input_type_utils.ts
index b519ee5aea7964..62b7a294e1750f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/input_type_utils.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_details/input_type_utils.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import {
-  DATASET_FIELD,
+  STATE_DATASET_FIELD,
   AGENT_DATASET_FILEBEAT,
   AGENT_DATASET_METRICBEAT,
 } from '../agent_logs/constants';
@@ -33,9 +33,11 @@ export function displayInputType(inputType: string): string {
 
 export function getLogsQueryByInputType(inputType: string) {
   if (inputType === 'logfile') {
-    return `_q=(${DATASET_FIELD.name}:!(${AGENT_DATASET_FILEBEAT}))`;
+    return `(${STATE_DATASET_FIELD}:!(${AGENT_DATASET_FILEBEAT}))`;
   }
   if (inputType.match(/\/metrics$/)) {
-    return `_q=(${DATASET_FIELD.name}:!(${AGENT_DATASET_METRICBEAT}))`;
+    return `(${STATE_DATASET_FIELD}:!(${AGENT_DATASET_METRICBEAT}))`;
   }
+
+  return '';
 }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/constants.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/constants.tsx
index f7fedeeedae2f7..4ee1618a385849 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/constants.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/constants.tsx
@@ -36,6 +36,8 @@ export const DEFAULT_LOGS_STATE: AgentLogsState = {
   query: '',
 };
 
+export const STATE_DATASET_FIELD = 'datasets';
+
 export const AGENT_LOG_LEVELS = {
   ERROR: 'error',
   WARNING: 'warning',