diff --git a/studio/components/interfaces/BillingV2/Subscription/BillingBreakdown.tsx b/studio/components/interfaces/BillingV2/Subscription/BillingBreakdown.tsx
index 5d4ee5b82a9..0e820f87202 100644
--- a/studio/components/interfaces/BillingV2/Subscription/BillingBreakdown.tsx
+++ b/studio/components/interfaces/BillingV2/Subscription/BillingBreakdown.tsx
@@ -177,7 +177,7 @@ const BillingBreakdown = ({}: BillingBreakdownProps) => {
                           </div>
                         </a>
                       </Link>
-                      {isUsageBillingEnabled && usageFee && (
+                      {isUsageBillingEnabled && hasLimit && usageFee && (
                         <Tooltip.Root delayDuration={0}>
                           <Tooltip.Trigger>
                             <div className="flex items-center">
diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingMetric.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingMetric.tsx
index 63ec35debed..00dd069207f 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingMetric.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/BillingBreakdown/BillingMetric.tsx
@@ -67,7 +67,7 @@ const BillingMetric = ({ idx, slug, metric, usage, subscription }: BillingMetric
           </a>
         </Link>
 
-        {isUsageBillingEnabled && usageFee && (
+        {isUsageBillingEnabled && hasLimit && usageFee && (
           <Tooltip.Root delayDuration={0}>
             <Tooltip.Trigger>
               <div className="flex items-center">