diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java b/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java
index a88a17fed3..662c773172 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/EnumStringPreference.java
@@ -30,7 +30,7 @@ public class EnumStringPreference<E extends Enum<E>> extends CommonPreference<E>
 
 	@Override
 	protected String toString(E o) {
-		return o.name();
+		return o == null ? null : o.name();
 	}
 
 	@Override