diff --git a/stock_request_picking_type/models/stock_request_order.py b/stock_request_picking_type/models/stock_request_order.py
index 2265ef129..ec8a20f3d 100644
--- a/stock_request_picking_type/models/stock_request_order.py
+++ b/stock_request_picking_type/models/stock_request_order.py
@@ -28,3 +28,13 @@ class StockRequestOrder(models.Model):
                         ('warehouse_id', '=', self.warehouse_id.id)], limit=1)
             if picking_type_id:
                     self._origin.write({'picking_type_id': picking_type_id.id})
+
+    @api.model
+    def create(self, vals):
+        if vals.get('warehouse_id', False):
+            picking_type_id = self.env['stock.picking.type'].\
+                search([('code', '=', 'stock_request_order'),
+                        ('warehouse_id', '=', vals['warehouse_id'])], limit=1)
+            if picking_type_id:
+                vals.update({'picking_type_id': picking_type_id.id})
+        return super().create(vals)