diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs
index 43c07fba..1b146a05 100644
--- a/server/AyaNova/Controllers/ScheduleController.cs
+++ b/server/AyaNova/Controllers/ScheduleController.cs
@@ -214,16 +214,20 @@ namespace AyaNova.Api.Controllers
 
         private static string ColorFromWOItem(ViewSchedulePersonalWorkOrder v, PersonalScheduleParams p)
         {
+
             switch (p.WisuColorSource)
             {
+                case PersonalScheduleWorkOrderColorSource.None:
+                    return GRAY_NEUTRAL_HEXA;
                 case PersonalScheduleWorkOrderColorSource.WorkOrderStatus:
-                    return v.WorkOrderStatusColor;
+                    return string.IsNullOrWhiteSpace(v.WorkOrderStatusColor) ? GRAY_NEUTRAL_HEXA : v.WorkOrderStatusColor;
                 case PersonalScheduleWorkOrderColorSource.WorkOrderItemStatus:
-                    return v.WorkOrderItemStatusColor;
+                    return string.IsNullOrWhiteSpace(v.WorkOrderItemStatusColor) ? GRAY_NEUTRAL_HEXA : v.WorkOrderItemStatusColor;
                 case PersonalScheduleWorkOrderColorSource.WorkOrderItemPriority:
-                    return v.WorkOrderItemPriorityColor;
+                    return string.IsNullOrWhiteSpace(v.WorkOrderItemPriorityColor) ? GRAY_NEUTRAL_HEXA : v.WorkOrderItemPriorityColor;
+
             }
-            return string.Empty;
+            return GRAY_NEUTRAL_HEXA;
         }
 
         private static string TextColor(string hexcolor)