diff --git a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js
index 480b70d..36fcd0c 100644
--- a/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js
+++ b/src/routes/app/routes/forms/routes/steppers/components/VerticalNonLinear.js
@@ -820,7 +820,7 @@ class VerticalNonLinear extends React.Component {
 
   handlePickupChanged = (res, state) => {
     let origin = {
-      id: res.id,
+      id: res.address_uuid ? res.address_uuid : res.id,
       name: res.name,
       lat: res.lat,
       lng: res.lng,