diff --git a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxTrackAnalysis.kt b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxTrackAnalysis.kt
index 9ebb5daa227..4ba11ce1c0a 100644
--- a/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxTrackAnalysis.kt
+++ b/OsmAnd-shared/src/commonMain/kotlin/net/osmand/shared/gpx/GpxTrackAnalysis.kt
@@ -463,10 +463,10 @@ class GpxTrackAnalysis {
 	private fun addWptAttribute(
 		point: WptPt, attribute: PointAttributes, pointsAnalyser: TrackPointsAnalyser?
 	) {
-		if (!hasSpeedData() && attribute.speed > 0 && totalDistance > 0) {
+		if (!hasSpeedData() && attribute.speed > 0) {
 			setHasData(POINT_SPEED, true)
 		}
-		if (!hasElevationData() && !attribute.elevation.isNaN() && totalDistance > 0) {
+		if (!hasElevationData() && !attribute.elevation.isNaN()) {
 			setHasData(POINT_ELEVATION, true)
 		}
 		pointsAnalyser?.onAnalysePoint(this, point, attribute)
diff --git a/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java b/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java
index 94ba6921e2c..6a52a882455 100644
--- a/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java
+++ b/OsmAnd/src/net/osmand/plus/plugins/externalsensors/SensorAttributesUtils.java
@@ -90,7 +90,7 @@ public static void onAnalysePoint(@NonNull GpxTrackAnalysis analysis, @NonNull W
 
 			attribute.setAttributeValue(tag, value);
 
-			if (!analysis.hasData(tag) && attribute.hasValidValue(tag) && analysis.getTotalDistance() > 0) {
+			if (!analysis.hasData(tag) && attribute.hasValidValue(tag)) {
 				analysis.setHasData(tag, true);
 			}
 		}