diff --git a/data/editor.config b/data/editor.config
index ca9936ec7f..5eec1f76c3 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -861,9 +861,6 @@
       <type id="shop-boutique" group="shop">
         <include group="poi_internet" />
       </type>
-      <type id="shop-cannabis" group="shop">
-        <include group="poi_internet" />
-      </type>
       <type id="shop-carpet" group="shop">
         <include group="poi_internet" />
       </type>
@@ -979,9 +976,6 @@
       </type>
       <type id="tourism-picnic_site" />
       <type id="leisure-picnic_table" />
-      <type id="amenity-brothel">
-        <include group="poi_internet" />
-      </type>
       <type id="leisure-park">
         <include field="name" />
         <include field="opening_hours" />
@@ -1045,7 +1039,6 @@
         <include field="name" />
         <include field="operator" />
       </type>
-
       <type id="amenity-food_court">
         <include group="poi_internet" />
       </type>
@@ -1055,15 +1048,29 @@
       <type id="amenity-money_transfer">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-stripclub">
+      <type id="amenity-vehicle_inspection">
         <include group="poi_internet" />
       </type>
       <type id="amenity-gambling">
         <include group="poi_internet" />
       </type>
-      <type id="amenity-vehicle_inspection">
+
+      <!-- Displaying following types explicitly in the list of addable features could be controversial.
+           See https://github.com/organicmaps/organicmaps/pull/7709#discussion_r1542074645
+      -->
+      <type id="amenity-brothel" can_add="no">
         <include group="poi_internet" />
       </type>
+      <type id="amenity-stripclub" can_add="no">
+        <include group="poi_internet" />
+      </type>
+      <type id="shop-cannabis" group="shop" can_add="no">
+        <include group="poi_internet" />
+      </type>
+      <type id="shop-erotic" group="shop" can_add="no">
+        <include group="poi_internet" />
+      </type>
+
       <type id="emergency-defibrillator">
       </type>
       <type id="emergency-fire_hydrant">
@@ -1137,9 +1144,6 @@
       <type id="shop-bookmaker">
         <include group="poi_internet" />
       </type>
-      <type id="shop-erotic" group="shop">
-        <include group="poi_internet" />
-      </type>
       <type id="shop-fabric" group="shop">
         <include group="poi_internet" />
       </type>