diff --git a/.vscode/launch.json b/.vscode/launch.json
index 134c77c3..f9f41af8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -48,7 +48,7 @@
         "AYANOVA_DATA_PATH": "c:\\temp\\ravendata",
         "AYANOVA_USE_URLS": "http://*:7575;",
         //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
-        "AYANOVA_SERVER_TEST_MODE": "true",
+        "AYANOVA_SERVER_TEST_MODE": "false",
         //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
         "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin\\"
diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs
index 9217a83b..e092cf82 100644
--- a/server/AyaNova/biz/QuoteBiz.cs
+++ b/server/AyaNova/biz/QuoteBiz.cs
@@ -945,8 +945,8 @@ namespace AyaNova.Biz
             }
             else
                 o.ContractViz = "-";
-                        
-            if (o.LastStatusId != null)
+
+            if (o.LastStatusId != null && o.States.Count > 0)
             {
                 var lastState = o.States[o.States.Count - 1];
                 o.LastStateColorViz = lastState.ColorViz;
@@ -1971,7 +1971,7 @@ namespace AyaNova.Biz
             bool isNew = currentObj == null;
             QuoteItemExpense oProposed = (QuoteItemExpense)proposedObj;
             var qid = await GetQuoteIdFromRelativeAsync(AyaType.QuoteItem, oProposed.QuoteItemId, ct);
-            var WorkorderInfo = await ct.Quote.AsNoTracking().Where(x => x.Id == qid.ParentId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();           
+            var WorkorderInfo = await ct.Quote.AsNoTracking().Where(x => x.Id == qid.ParentId).Select(x => new { Serial = x.Serial, Tags = x.Tags }).FirstOrDefaultAsync();
             oProposed.Tags = WorkorderInfo.Tags;
 
             //STANDARD EVENTS FOR ALL OBJECTS
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index dc7b9a07..94a044b6 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -1102,7 +1102,7 @@ namespace AyaNova.Biz
                 o.FromPMViz = value;
             }
 
-            if (o.LastStatusId != null)
+            if (o.LastStatusId != null && o.States.Count > 0)
             {
                 var lastState = o.States[o.States.Count - 1];
                 o.LastStateColorViz = lastState.ColorViz;