diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
index 493c80b874..6101a87e83 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
@@ -353,6 +353,8 @@ public class AdvancedEditPoiFragment extends Fragment
 			HashSet<String> tagKeys = new HashSet<>();
 			HashSet<String> valueKeys = new HashSet<>();
 			for (AbstractPoiType abstractPoiType : result.values()) {
+				if (abstractPoiType instanceof PoiType &&
+						((PoiType) abstractPoiType).isNotEditableOsm()) continue;
 				addPoiToStringSet(abstractPoiType, tagKeys, valueKeys);
 			}
 			addPoiToStringSet(mapPoiTypes.getOtherMapCategory(), tagKeys, valueKeys);