diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiData.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiData.java
index 86ea01258e..e081c60c59 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiData.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiData.java
@@ -253,8 +253,8 @@ public class EditPoiData {
 	}
 
 	public boolean hasEmptyValue() {
-		for (String value : tagValues.values()) {
-			if (value.isEmpty()) {
+		for (Map.Entry<String, String> tag : tagValues.entrySet()) {
+			if (tag.getValue().isEmpty() && !POI_TYPE_TAG.equals(tag.getKey())) {
 				return true;
 			}
 		}