diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index 0862268e4b..7062ee095c 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -81,7 +81,10 @@ public class FavouritesDbHelper extends SQLiteOpenHelper {
 				WptPt pt = new WptPt();
 				pt.lat = p.getLatitude();
 				pt.lon = p.getLongitude();
-				pt.name = p.getName() + "_" + p.getCategory();
+				if (p.getCategory().length() > 0)
+					pt.name = p.getName() + "_" + p.getCategory();
+				else
+					pt.name = p.getName();
 				gpx.points.add(pt);
 			}
 		}