diff --git a/internal/services/billing/consumption_data_source.go b/internal/services/billing/consumption_data_source.go
index 0d6006acbe..02f4b534c4 100644
--- a/internal/services/billing/consumption_data_source.go
+++ b/internal/services/billing/consumption_data_source.go
@@ -69,6 +69,8 @@ func DataSourceConsumptions() *schema.Resource {
 				Type:        schema.TypeString,
 			},
 		},
+		EnableLegacyTypeSystemApplyErrors: true,
+		EnableLegacyTypeSystemPlanErrors:  true,
 	}
 }
 
diff --git a/internal/services/billing/invoices_data_source.go b/internal/services/billing/invoices_data_source.go
index 78c168d746..568c127bc7 100644
--- a/internal/services/billing/invoices_data_source.go
+++ b/internal/services/billing/invoices_data_source.go
@@ -124,6 +124,8 @@ func DataSourceInvoices() *schema.Resource {
 			},
 			"organization_id": account.OrganizationIDSchema(),
 		},
+		EnableLegacyTypeSystemApplyErrors: true,
+		EnableLegacyTypeSystemPlanErrors:  true,
 	}
 }