2 files changed, 4 insertions, 0 deletions
diff --git a/subsurface-core/dive.c b/subsurface-core/dive.c
index 8c69e9a6a..e06a25fa4 100644
--- a/subsurface-core/dive.c
+++ b/subsurface-core/dive.c
@@ -1155,6 +1155,8 @@ static void fixup_water_salinity(struct dive *dive)
 
 	for_each_dc (dive, dc) {
 		if (dc->salinity) {
+			if (dc->salinity < 500)
+				dc->salinity += FRESHWATER_SALINITY;
 			sum += dc->salinity;
 			nr++;
 		}
diff --git a/subsurface-core/dive.h b/subsurface-core/dive.h
index 0f5c43451..f8970b237 100644
--- a/subsurface-core/dive.h
+++ b/subsurface-core/dive.h
@@ -409,6 +409,8 @@ static inline int calculate_depth_to_mbar(int depth, pressure_t surface_pressure
 		mbar = SURFACE_PRESSURE;
 	if (!salinity)
 		salinity = SEAWATER_SALINITY;
+	if (salinity < 500)
+		salinity += FRESHWATER_SALINITY;
 	specific_weight = salinity / 10000.0 * 0.981;
 	mbar += rint(depth / 10.0 * specific_weight);
 	return mbar;