diff --git a/app/models/chargeback.rb b/app/models/chargeback.rb
index 9062efc08e4..da3b4dc2dc3 100644
--- a/app/models/chargeback.rb
+++ b/app/models/chargeback.rb
@@ -60,7 +60,7 @@ def initialize(options, consumption)
     self.start_date, self.end_date, self.display_range = options.report_step_range(consumption.timestamp)
     self.interval_name = options.interval
     self.chargeback_rates = ''
-    self.entity = consumption.resource
+    self.entity ||= consumption.resource
   end
 
   def calculate_costs(consumption, rates)