diff --git a/site/.oxlintrc.jsonc b/site/.oxlintrc.jsonc
index 55f83bda461..b8f9897414a 100644
--- a/site/.oxlintrc.jsonc
+++ b/site/.oxlintrc.jsonc
@@ -21,6 +21,7 @@
 		"img-redundant-alt": "error",
 		"no-redundant-roles": "error",
 		"role-has-required-aria-props": "error",
+		"role-supports-aria-props": "error",
 		"alt-text": "error",
 		"anchor-has-content": "error",
 		"anchor-ambiguous-text": "error",
@@ -207,7 +208,6 @@
 		"consistent-type-imports": "off", // style/useImportType (medium)
 		"jsx-curly-brace-presence": "off", // style/useConsistentCurlyBraces (medium, coder error rule)
 		"no-fallthrough": "off", // suspicious/noFallthroughSwitchClause (medium)
-		"role-supports-aria-props": "off", // a11y/useAriaPropsSupportedByRole (small)
 		"click-events-have-key-events": "off", // a11y/useKeyWithClickEvents (small)
 		"prefer-function-type": "off", // style/useShorthandFunctionType (small)
 		"no-empty-interface": "off", // suspicious/noEmptyInterface (small)
diff --git a/site/src/components/Autocomplete/Autocomplete.tsx b/site/src/components/Autocomplete/Autocomplete.tsx
index 4b0696c0c25..42d15466dc5 100644
--- a/site/src/components/Autocomplete/Autocomplete.tsx
+++ b/site/src/components/Autocomplete/Autocomplete.tsx
@@ -374,7 +374,6 @@ export function Autocomplete<TOption>({
 					data-testid={testId}
 					aria-expanded={isOpen}
 					aria-haspopup="listbox"
-					aria-invalid={triggerAriaInvalid}
 					aria-describedby={triggerAriaDescribedBy}
 					disabled={disabled}
 					className={cn(
diff --git a/site/src/modules/resources/AgentLatency.tsx b/site/src/modules/resources/AgentLatency.tsx
index 6c70da2664b..48c84602843 100644
--- a/site/src/modules/resources/AgentLatency.tsx
+++ b/site/src/modules/resources/AgentLatency.tsx
@@ -43,13 +43,13 @@ export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
 	return (
 		<HelpPopover>
 			<HelpPopoverTrigger asChild>
-				<span
-					role="presentation"
+				<button
+					type="button"
 					aria-label="latency"
 					className={cn("cursor-pointer", latency.color)}
 				>
 					{Math.round(latency.latency_ms)}ms
-				</span>
+				</button>
 			</HelpPopoverTrigger>
 			<HelpPopoverContent>
 				<HelpPopoverTitle>Latency</HelpPopoverTitle>