diff --git a/classes/stock/Warehouse.php b/classes/stock/Warehouse.php
index 955460ed1..e29a9d2ca 100644
--- a/classes/stock/Warehouse.php
+++ b/classes/stock/Warehouse.php
@@ -132,12 +132,15 @@ class WarehouseCore extends ObjectModel
 	 *
 	 * @return array Ids of the associated carriers
 	 */
-	public function getCarriers()
+	public function getCarriers($return_reference = false)
 	{
 		$ids_carrier = array();
 
 		$query = new DbQuery();
-		$query->select('c.id_carrier');
+		if ($return_reference)
+			$query->select('wc.id_carrier');
+		else
+			$query->select('c.id_carrier');
 		$query->from('warehouse_carrier', 'wc');
 		$query->innerJoin('carrier', 'c', 'c.id_reference = wc.id_carrier');
 		$query->where($this->def['primary'].' = '.(int)$this->id);
diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php
index 79f642151..8a1e4aaba 100644
--- a/controllers/admin/AdminWarehousesController.php
+++ b/controllers/admin/AdminWarehousesController.php
@@ -349,7 +349,7 @@ class AdminWarehousesControllerCore extends AdminController
 			$ids_shop[] = $shop['id_shop'];
 
 		// loads current carriers associated with this warehouse
-		$carriers = $obj->getCarriers();
+		$carriers = $obj->getCarriers(true);
 
 		// if an address is available : force specific fields values
 		if ($address != null)