diff --git a/addons/stock/tests/test_stock_return_picking.py b/addons/stock/tests/test_stock_return_picking.py
index f080a2e0081..0947c1047c1 100644
--- a/addons/stock/tests/test_stock_return_picking.py
+++ b/addons/stock/tests/test_stock_return_picking.py
@@ -175,3 +175,35 @@ class TestReturnPicking(TestStockCommon):
         return_picking = self.env['stock.picking'].browse(stock_return_picking_action['res_id'])
         return_picking.button_validate()
         self.assertEqual(return_picking.move_ids[0].partner_id.id, receipt.partner_id.id)
+
+    def test_return_wizard_with_partial_delivery(self):
+        """
+        Create a picking for 10 units, deliver 6, and do not backorder the remaining 4.
+        Then, attempt to return the quantity that was delivered. The return should be created with the correct quantity.
+        """
+        delivery_picking = self.PickingObj.create({
+            'picking_type_id': self.picking_type_out,
+            'location_id': self.stock_location,
+            'location_dest_id': self.customer_location,
+        })
+        out_move = self.MoveObj.create({
+            'name': "OUT move",
+            'product_id':self.productA.id,
+            'product_uom_qty': 10,
+            'picking_id': delivery_picking.id,
+            'location_id': self.stock_location,
+            'location_dest_id': self.customer_location,
+        })
+        delivery_picking.action_confirm()
+        out_move.quantity = 6
+        # No backorder
+        res_dict = delivery_picking.with_context(picking_ids_not_to_backorder=delivery_picking.id).button_validate()
+
+        self.env['stock.backorder.confirmation'].with_context(res_dict['context']).process()
+        self.assertEqual(delivery_picking.state, 'done', "Pickings should be set as done")
+        # Create return
+        stock_return_picking_form = Form(self.env['stock.return.picking']
+            .with_context(active_ids=delivery_picking.ids, active_id=delivery_picking.ids[0],
+            active_model='stock.picking'))
+        stock_return_picking = stock_return_picking_form.save()
+        self.assertEqual(stock_return_picking.product_return_moves.quantity, 6)
diff --git a/addons/stock/wizard/stock_picking_return.py b/addons/stock/wizard/stock_picking_return.py
index 28a7eb2b138..2309c28c761 100644
--- a/addons/stock/wizard/stock_picking_return.py
+++ b/addons/stock/wizard/stock_picking_return.py
@@ -78,14 +78,11 @@ class ReturnPicking(models.TransientModel):
 
     @api.model
     def _prepare_stock_return_picking_line_vals_from_move(self, stock_move):
-        quantity = stock_move.product_qty
+        quantity = stock_move.quantity
         for move in stock_move.move_dest_ids:
             if not move.origin_returned_move_id or move.origin_returned_move_id != stock_move:
                 continue
-            if move.state in ('partially_available', 'assigned'):
-                quantity -= sum(move.move_line_ids.mapped('quantity'))
-            elif move.state in ('done'):
-                quantity -= move.product_qty
+            quantity -= move.quantity
         quantity = float_round(quantity, precision_rounding=stock_move.product_id.uom_id.rounding)
         return {
             'product_id': stock_move.product_id.id,