diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py
index 7dfa4ce5..bba227ea 100644
--- a/rma/models/rma_order_line.py
+++ b/rma/models/rma_order_line.py
@@ -566,7 +566,6 @@ class RmaOrderLine(models.Model):
                 operation.location_id.id
                 or operation.in_warehouse_id.lot_rma_id.id
                 or operation.out_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
             ),
         }
         return data
diff --git a/rma_account/models/rma_order_line.py b/rma_account/models/rma_order_line.py
index 4e549aa1..60e0ab00 100644
--- a/rma_account/models/rma_order_line.py
+++ b/rma_account/models/rma_order_line.py
@@ -224,9 +224,7 @@ class RmaOrderLine(models.Model):
             "in_route_id": operation.in_route_id.id or route.id,
             "out_route_id": operation.out_route_id.id or route.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
         }
         return data
diff --git a/rma_account/wizards/rma_add_account_move.py b/rma_account/wizards/rma_add_account_move.py
index 642bda4a..a8af9232 100644
--- a/rma_account/wizards/rma_add_account_move.py
+++ b/rma_account/wizards/rma_add_account_move.py
@@ -100,9 +100,7 @@ class RmaAddAccountMove(models.TransientModel):
             "in_route_id": operation.in_route_id.id or route.id,
             "out_route_id": operation.out_route_id.id or route.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
         }
         return data
diff --git a/rma_purchase/models/rma_order_line.py b/rma_purchase/models/rma_order_line.py
index 42360794..5c11897d 100644
--- a/rma_purchase/models/rma_order_line.py
+++ b/rma_purchase/models/rma_order_line.py
@@ -167,9 +167,7 @@ class RmaOrderLine(models.Model):
             "receipt_policy": operation.receipt_policy,
             "currency_id": line.currency_id.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
             "refund_policy": operation.refund_policy,
             "delivery_policy": operation.delivery_policy,
diff --git a/rma_purchase/wizards/rma_add_purchase.py b/rma_purchase/wizards/rma_add_purchase.py
index 26aed30a..18550a78 100644
--- a/rma_purchase/wizards/rma_add_purchase.py
+++ b/rma_purchase/wizards/rma_add_purchase.py
@@ -97,9 +97,7 @@ class RmaAddPurchase(models.TransientModel):
             "out_route_id": operation.out_route_id.id or route,
             "receipt_policy": operation.receipt_policy,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
             "refund_policy": operation.refund_policy,
             "delivery_policy": operation.delivery_policy,
diff --git a/rma_sale/models/rma_order_line.py b/rma_sale/models/rma_order_line.py
index feff0161..69a7cfc2 100644
--- a/rma_sale/models/rma_order_line.py
+++ b/rma_sale/models/rma_order_line.py
@@ -153,9 +153,7 @@ class RmaOrderLine(models.Model):
             "receipt_policy": operation.receipt_policy,
             "currency_id": line.currency_id.id,
             "location_id": (
-                operation.location_id.id
-                or operation.in_warehouse_id.lot_rma_id.id
-                or warehouse.lot_rma_id.id
+                operation.location_id.id or operation.in_warehouse_id.lot_rma_id.id
             ),
             "refund_policy": operation.refund_policy,
             "delivery_policy": operation.delivery_policy,