diff --git a/server/AyaNova/biz/PMBiz.cs b/server/AyaNova/biz/PMBiz.cs
index 44bf1334..1ce0c95f 100644
--- a/server/AyaNova/biz/PMBiz.cs
+++ b/server/AyaNova/biz/PMBiz.cs
@@ -465,6 +465,9 @@ namespace AyaNova.Biz
 
         private async Task AutoSetAddressAsync(PM newObj)
         {
+            if(!string.IsNullOrWhiteSpace(newObj.PostAddress) || !string.IsNullOrWhiteSpace(newObj.Address))
+                return;
+                
             if (newObj.CustomerId == 0)
                 return;
 
diff --git a/server/AyaNova/biz/QuoteBiz.cs b/server/AyaNova/biz/QuoteBiz.cs
index 0fc81307..d5df3526 100644
--- a/server/AyaNova/biz/QuoteBiz.cs
+++ b/server/AyaNova/biz/QuoteBiz.cs
@@ -437,6 +437,9 @@ namespace AyaNova.Biz
 
         private async Task AutoSetAddressAsync(Quote newObj)
         {
+            if(!string.IsNullOrWhiteSpace(newObj.PostAddress) || !string.IsNullOrWhiteSpace(newObj.Address))
+                return;
+                
             if (newObj.CustomerId == 0)
                 return;
 
diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs
index 2fc94c1f..f1c25107 100644
--- a/server/AyaNova/biz/WorkOrderBiz.cs
+++ b/server/AyaNova/biz/WorkOrderBiz.cs
@@ -463,6 +463,11 @@ namespace AyaNova.Biz
 
         private async Task AutoSetAddressAsync(WorkOrder newObj)
         {
+
+            if(!string.IsNullOrWhiteSpace(newObj.PostAddress) || !string.IsNullOrWhiteSpace(newObj.Address))
+                return;
+            
+
             if (newObj.CustomerId == 0)
                 return;