diff --git a/frontend/src/app/(dashboard)/(teamAccount)/[accountSlug]/settings/billing/page.tsx b/frontend/src/app/(dashboard)/(teamAccount)/[accountSlug]/settings/billing/page.tsx
index eaf0c305..bf2650b5 100644
--- a/frontend/src/app/(dashboard)/(teamAccount)/[accountSlug]/settings/billing/page.tsx
+++ b/frontend/src/app/(dashboard)/(teamAccount)/[accountSlug]/settings/billing/page.tsx
@@ -137,8 +137,8 @@ export default function TeamBillingPage({
                       Agent Usage This Month
                     </span>
                     <span className="text-sm font-medium">
-                      ${subscriptionData.current_usage?.toFixed(2) || '0'} /{' '}
-                      ${subscriptionData.cost_limit || '0'}
+                      {subscriptionData.credits?.lifetime_used?.toFixed(2) || '0'} /{' '}
+                      {subscriptionData.credits?.tier_credits || '0'}
                     </span>
                     <Button variant='outline' asChild className='text-sm'>
                       <Link href="/settings/usage-logs">
diff --git a/frontend/src/contexts/SubscriptionContext.tsx b/frontend/src/contexts/SubscriptionContext.tsx
index b5768aab..e01f36da 100644
--- a/frontend/src/contexts/SubscriptionContext.tsx
+++ b/frontend/src/contexts/SubscriptionContext.tsx
@@ -91,19 +91,16 @@ export function useSharedSubscription() {
   };
 }
 
-/**
- * Hook for backward compatibility - maps new credit-based data to old format
- * This hook works both inside and outside the provider
- */
 export function useSubscriptionData() {
   const context = useContext(SubscriptionContext);
   
-  // If context is available, use it and map to old format
+  const directSubscription = useSubscription();
+  const directCreditBalance = useCreditBalance();
+  
   if (context) {
     return {
       data: context.subscriptionData ? {
         ...context.subscriptionData,
-        // Map new credit fields to old format for compatibility
         current_usage: context.creditBalance?.lifetime_used || 0,
         cost_limit: context.subscriptionData.tier.credits,
         credit_balance: context.creditBalance?.balance || 0,
@@ -119,9 +116,9 @@ export function useSubscriptionData() {
     };
   }
   
-  // If no context, use the hook directly (for use outside provider)
-  const { data, isLoading, error, refetch } = useSubscription();
-  const { data: creditBalance } = useCreditBalance();
+  // If no context, use the hooks directly (for use outside provider)
+  const { data, isLoading, error, refetch } = directSubscription;
+  const { data: creditBalance } = directCreditBalance;
   
   return {
     data: data ? {