diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index df8e34f9..117d616c 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -4098,9 +4098,20 @@ namespace AyaNova.Biz
             o.PartNameViz = part.Name;
             o.UpcViz = part.UPC;
 
+          
             TaxCode Tax = null;
             if (o.TaxPartSaleId != null)
-                Tax = await ct.TaxCode.AsNoTracking().FirstOrDefaultAsync(z => z.Id == o.TaxPartSaleId);
+            {
+                if (!oc.Has("tax", o.TaxPartSaleId))
+                {
+                    Tax = await ct.TaxCode.AsNoTracking().FirstOrDefaultAsync(z => z.Id == o.TaxPartSaleId);
+                    oc.Add(Tax, "tax", o.TaxPartSaleId);
+                }
+                else
+                    Tax = (TaxCode)oc.Get("tax", o.TaxPartSaleId);
+            }
+
+
             if (Tax != null)
                 o.TaxCodeViz = Tax.Name;
 
@@ -5872,7 +5883,7 @@ namespace AyaNova.Biz
                 if (!oc.Has("tax", o.TaxCodeSaleId))
                 {
                     Tax = await ct.TaxCode.AsNoTracking().FirstOrDefaultAsync(z => z.Id == o.TaxCodeSaleId);
-                    oc.Add(Rate, "tax", o.TaxCodeSaleId);
+                    oc.Add(Tax, "tax", o.TaxCodeSaleId);
                 }
                 else
                     Tax = (TaxCode)oc.Get("tax", o.TaxCodeSaleId);