diff --git a/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs b/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs
index 33227e7..9de9b5f 100644
--- a/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs
+++ b/Api.SeaHavenIndustries/Controllers/WorkOrderController.cs
@@ -610,7 +610,7 @@ namespace Api.SeaHavenIndustries.Controllers
                 assignee = s.AssignToUser != null ? s.AssignToUser.FirstName : "",
                 location = s.Locations != null ? s.Locations.Name : "",
                 locationId = s.LocationId,
-                locationZip = s.Locations != null ? s.Locations.ZipCode : "",
+                locationZip = s.Locations != null ? (s.Locations.ZipCode ?? ExtractZip(s.Locations.Address)) : "",
                 priority = s.Priority,
                 s.Problem,
                 s.Trade,
@@ -1115,6 +1115,13 @@ namespace Api.SeaHavenIndustries.Controllers
             return Ok(data);
         }
 
+        private static string? ExtractZip(string? address)
+        {
+            if (string.IsNullOrWhiteSpace(address)) return null;
+            var match = System.Text.RegularExpressions.Regex.Match(address, @"\b(\d{5})(?:-\d{4})?\b");
+            return match.Success ? match.Groups[1].Value : null;
+        }
+
         private async Task<string> GenerateInternalWONumber()
         {
             var lastWO = await _db.workOrders