diff --git a/src/app/components/ItemDisplay.tsx b/src/app/components/ItemDisplay.tsx
index dbe962fc..116e8f6c 100644
--- a/src/app/components/ItemDisplay.tsx
+++ b/src/app/components/ItemDisplay.tsx
@@ -61,7 +61,7 @@ export function ItemDisplay({ item, slotDecoration, tooltip, advancedTooltip }:
 			</svg>}
 			<div class="item-slot-overlay"></div>
 		</>}
-		{tooltip !== false && <div class="item-tooltip" style={tooltipOffset && {
+		{tooltip !== false && !resolvedItem.has('hide_tooltip') && <div class="item-tooltip" style={tooltipOffset && {
 			left: (tooltipSwap ? undefined : `${tooltipOffset[0]}px`),
 			right: (tooltipSwap ? `${tooltipOffset[0]}px` : undefined),
 			top: `${tooltipOffset[1]}px`,
diff --git a/src/app/components/ItemTooltip.tsx b/src/app/components/ItemTooltip.tsx
index 61fc185e..433ee63d 100644
--- a/src/app/components/ItemTooltip.tsx
+++ b/src/app/components/ItemTooltip.tsx
@@ -11,10 +11,6 @@ interface Props {
 	resolver: (item: ItemStack) => ResolvedItem,
 }
 export function ItemTooltip({ item, advanced, resolver }: Props) {
-	if (item.has('hide_tooltip')) {
-		return <></>
-	}
-
 	return <>
 		<TextComponent component={item.getStyledHoverName()} />
 		{!advanced && !item.has('custom_name') && item.is('filled_map') && item.has('map_id') && (