diff --git a/pos_place/models/pos_session.py b/pos_place/models/pos_session.py
index 2aeb47de77..803f355031 100644
--- a/pos_place/models/pos_session.py
+++ b/pos_place/models/pos_session.py
@@ -9,14 +9,15 @@ class PosSession(models.Model):
 
     def _pos_data_process(self, loaded_data):
         super()._pos_data_process(loaded_data)
+        place_qty = len(loaded_data["pos.place"])
         loaded_data["pos.place"] = [
             {"id": False, "code": "", "name": _("No Place")}
         ] + loaded_data["pos.place"]
         loaded_data["place_by_id"] = {
             place["id"]: place for place in loaded_data["pos.place"]
         }
-        loaded_data["enable_place"] = self.env.user.has_group(
-            "pos_place.group_pos_place_user"
+        loaded_data["enable_place"] = (
+            self.env.user.has_group("pos_place.group_pos_place_user") and place_qty
         )
         return
 
diff --git a/pos_place/views/view_pos_order.xml b/pos_place/views/view_pos_order.xml
index 181872ea75..8f7ee68c10 100644
--- a/pos_place/views/view_pos_order.xml
+++ b/pos_place/views/view_pos_order.xml
@@ -32,7 +32,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
                 <field
                     name="place_id"
                     groups="pos_place.group_pos_place_user"
-                    optional="show"
+                    optional="hide"
                 />
             </field>
         </field>