diff --git a/addons/stock_picking_batch/views/stock_picking_type_views.xml b/addons/stock_picking_batch/views/stock_picking_type_views.xml
index e86b11e6086..7d6bdb970b1 100644
--- a/addons/stock_picking_batch/views/stock_picking_type_views.xml
+++ b/addons/stock_picking_batch/views/stock_picking_type_views.xml
@@ -19,12 +19,12 @@
                             <field name="batch_group_by_destination"/>
                             <label for="batch_group_by_destination"/>
                         </div>
-                        <span attrs="{'invisible':[('auto_batch', '=', False)]}" groups="stock.group_stock_multi_locations"/>
+                        <span attrs="{'invisible':['|', ('auto_batch', '=', False), ('default_location_src_id', '=', False)]}" groups="stock.group_stock_multi_locations"/>
                         <div name="batch_source_location" class="o_row" attrs="{'invisible':['|', ('auto_batch', '=', False), ('default_location_src_id', '=', False)]}" groups="stock.group_stock_multi_locations">
                             <field name="batch_group_by_src_loc"/>
                             <label for="batch_group_by_src_loc"/>
                         </div>
-                        <span attrs="{'invisible':[('auto_batch', '=', False)]}" groups="stock.group_stock_multi_locations"/>
+                        <span attrs="{'invisible':['|', ('auto_batch', '=', False), ('default_location_dest_id', '=', False)]}" groups="stock.group_stock_multi_locations"/>
                         <div name="batch_dest_subloc" class="o_row" attrs="{'invisible':['|', ('auto_batch', '=', False), ('default_location_dest_id', '=', False)]}" groups="stock.group_stock_multi_locations">
                             <field name="batch_group_by_dest_loc"/>
                             <label for="batch_group_by_dest_loc"/>