diff --git a/stock_vertical_lift/models/vertical_lift_shuttle.py b/stock_vertical_lift/models/vertical_lift_shuttle.py
index 796ff9b80..2533f587c 100644
--- a/stock_vertical_lift/models/vertical_lift_shuttle.py
+++ b/stock_vertical_lift/models/vertical_lift_shuttle.py
@@ -145,6 +145,11 @@ class VerticalLiftShuttle(models.Model):
         record = self.env[model].search([("shuttle_id", "=", self.id)])
         if not record:
             record = self.env[model].create({"shuttle_id": self.id})
+        # Since https://github.com/odoo/odoo/commit/3a6ac95
+        # _compute_vertical_lift_shuttle_id() don't work fine
+        # These change fix it temporally
+        if "location_id" in record:
+            record.location_id._compute_vertical_lift_shuttle_id()
         return record
 
     def action_open_screen(self):