diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 3bfcdae64..405a3e8a2 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -814,7 +814,11 @@ const CreateCosts = (job) => {
       ].add(
         Dinero({
           amount: Math.round((ticket_val.rate || 0) * 100),
-        }).multiply(ticket_val.actualhrs || ticket_val.productivehrs || 0)
+        }).multiply(
+          (ticket_val.flat_rate
+            ? ticket_val.productivehrs
+            : ticket_val.actualhrs) || 0
+        )
       );
 
       return ticket_acc;
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 88ff022ac..de12f518e 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -775,6 +775,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       cost_center
       actualhrs
       productivehrs
+      flat_rate
     }
     area_of_damage
     employee_prep_rel {