diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
index b889ffabfc..aad47482f7 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityLayers.java
@@ -589,7 +589,7 @@ public class MapActivityLayers {
 					String filterId;
 					if (which == 0) {
 						filterId = PoiFiltersHelper.getOsmDefinedFilterId(null);
-					} else if (which <= userDefined.size()) {
+					} else if (which <= userDefined.size() + 1) {
 						filterId = userDefined.get(which - 2).getFilterId();
 					} else {
 						filterId = PoiFiltersHelper.getOsmDefinedFilterId(AmenityType.values()[which - userDefined.size() - 2]);