diff --git a/web/cypress/e2e/integration/logs-page.cy.ts b/web/cypress/e2e/integration/logs-page.cy.ts
index 5e1e112c2..9f092cabb 100644
--- a/web/cypress/e2e/integration/logs-page.cy.ts
+++ b/web/cypress/e2e/integration/logs-page.cy.ts
@@ -350,8 +350,6 @@ describe('Logs Page', () => {
     cy.getByTestId(TestIds.SeverityDropdown).within(() => {
       cy.get('button').should('be.disabled');
     });
-
-    cy.getByTestId(TestIds.TenantToggle).should('be.disabled');
   });
 
   it('updates the query when selecting filters', () => {
diff --git a/web/src/components/logs-query-input.tsx b/web/src/components/logs-query-input.tsx
index a7f2d915f..3b5b433c9 100644
--- a/web/src/components/logs-query-input.tsx
+++ b/web/src/components/logs-query-input.tsx
@@ -12,6 +12,7 @@ interface LogsQueryInputProps {
   onRun?: () => void;
   isDisabled?: boolean;
   invalidQueryErrorMessage?: string | null;
+  tenant?: string;
 }
 
 export const LogsQueryInput: React.FC<LogsQueryInputProps> = ({
@@ -20,6 +21,7 @@ export const LogsQueryInput: React.FC<LogsQueryInputProps> = ({
   onRun,
   isDisabled,
   invalidQueryErrorMessage,
+  tenant,
 }) => {
   const { t } = useTranslation('plugin__logging-view-plugin');
 
@@ -39,7 +41,9 @@ export const LogsQueryInput: React.FC<LogsQueryInputProps> = ({
     setInternalValue(value);
     const parsedQuery = new LogQLQuery(value);
 
-    setIsValid(parsedQuery.streamSelector.length > 0);
+    // show invalid message only when query is empty for application tenant,
+    // audit and infrastructure don't necessarily need a stream selector
+    setIsValid(tenant === 'application' && parsedQuery.streamSelector.length > 0);
   }, [value]);
 
   const handleOnChange = (text: string) => {
diff --git a/web/src/components/logs-toolbar.tsx b/web/src/components/logs-toolbar.tsx
index e9832f0de..f16185b06 100644
--- a/web/src/components/logs-toolbar.tsx
+++ b/web/src/components/logs-toolbar.tsx
@@ -238,11 +238,7 @@ export const LogsToolbar: React.FC<LogsToolbarProps> = ({
 
         {enableTenantDropdown && (
           <ToolbarGroup>
-            <TenantDropdown
-              onTenantSelected={onTenantSelect}
-              selectedTenant={tenant}
-              isDisabled={isDisabled}
-            />
+            <TenantDropdown onTenantSelected={onTenantSelect} selectedTenant={tenant} />
           </ToolbarGroup>
         )}
 
@@ -322,6 +318,7 @@ export const LogsToolbar: React.FC<LogsToolbarProps> = ({
           onChange={onQueryChange}
           invalidQueryErrorMessage={invalidQueryErrorMessage}
           isDisabled={isDisabled}
+          tenant={tenant}
         />
       )}
     </Toolbar>