diff --git a/static/gsApp/views/subscriptionPage/reservedUsageChart.spec.tsx b/static/gsApp/views/subscriptionPage/reservedUsageChart.spec.tsx
index 11fb53f4c46a49..d8a87f87847d48 100644
--- a/static/gsApp/views/subscriptionPage/reservedUsageChart.spec.tsx
+++ b/static/gsApp/views/subscriptionPage/reservedUsageChart.spec.tsx
@@ -664,7 +664,13 @@ describe('getCategoryOptions', () => {
     });
 
     result.forEach(option => {
-      expect(subscription.planDetails.checkoutCategories).toContain(option.value);
+      const inCheckoutCategories = subscription.planDetails.checkoutCategories.includes(
+        option.value
+      );
+      const inOnDemandCategories = subscription.planDetails.onDemandCategories.includes(
+        option.value
+      );
+      expect(inCheckoutCategories || inOnDemandCategories).toBe(true);
     });
   });
 
diff --git a/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx b/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
index b5430c1d0d6984..802abfcd195e5d 100644
--- a/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
+++ b/static/gsApp/views/subscriptionPage/reservedUsageChart.tsx
@@ -77,7 +77,8 @@ export function getCategoryOptions({
 }): CategoryOption[] {
   return USAGE_CHART_OPTIONS_DATACATEGORY.filter(
     opt =>
-      plan.checkoutCategories.includes(opt.value as DataCategory) &&
+      (plan.checkoutCategories.includes(opt.value as DataCategory) ||
+        plan.onDemandCategories.includes(opt.value as DataCategory)) &&
       (opt.value === DataCategory.SPANS_INDEXED ? hadCustomDynamicSampling : true)
   );
 }