diff --git a/core/divelist.c b/core/divelist.c
index be7f2831a..8886d7ce2 100644
--- a/core/divelist.c
+++ b/core/divelist.c
@@ -47,7 +47,7 @@ void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2max_p)
 			continue;
 		if (o2 > maxo2)
 			maxo2 = o2;
-		if (o2 < mino2)
+		if (o2 < mino2 && maxhe <= 0)
 			mino2 = o2;
 		if (he > maxhe)
 			goto newmax;