diff --git a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
index 6f178a3b80..557610bf78 100644
--- a/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
+++ b/OsmAnd/src/net/osmand/plus/poi/PoiUIFilter.java
@@ -578,8 +578,10 @@ public class PoiUIFilter implements SearchPoiTypeFilter, Comparable<PoiUIFilter>
 
 	private void putAllAcceptedTypes(Map<PoiCategory, LinkedHashSet<String>> types) {
 		for (PoiCategory category : types.keySet()) {
-			if (acceptedTypes.get(category) != null) {
-				acceptedTypes.get(category).addAll(types.get(category));
+			if (acceptedTypes.containsKey(category)) {
+				if (acceptedTypes.get(category) != null) {
+					acceptedTypes.get(category).addAll(types.get(category));
+				}
 			} else {
 				acceptedTypes.put(category, types.get(category));
 			}