diff --git a/Telegram/SourceFiles/data/data_statistics_chart.cpp b/Telegram/SourceFiles/data/data_statistics_chart.cpp
index 3014bf04f..fbfc42b81 100644
--- a/Telegram/SourceFiles/data/data_statistics_chart.cpp
+++ b/Telegram/SourceFiles/data/data_statistics_chart.cpp
@@ -99,6 +99,7 @@ int StatisticalChart::findStartIndex(float64 v) const {
 }
 
 int StatisticalChart::findEndIndex(int left, float64 v) const {
+	const auto wasLeft = left;
 	const auto n = int(xPercentage.size());
 	if (v == 1.) {
 		return n - 1;
@@ -120,7 +121,7 @@ int StatisticalChart::findEndIndex(int left, float64 v) const {
 			left = middle + 1;
 		}
 	}
-	return right;
+	return std::max(wasLeft, right);
 }
 
 
diff --git a/Telegram/SourceFiles/statistics/segment_tree.cpp b/Telegram/SourceFiles/statistics/segment_tree.cpp
index 8ba222a6e..f19f8b8d6 100644
--- a/Telegram/SourceFiles/statistics/segment_tree.cpp
+++ b/Telegram/SourceFiles/statistics/segment_tree.cpp
@@ -50,7 +50,7 @@ void SegmentTree::build(int v, int from, int size) {
 
 int SegmentTree::rMaxQ(int from, int to) {
 	if (_array.size() < kMinArraySize) {
-		auto max = std::numeric_limits<int>::min();
+		auto max = 0;
 		from = std::max(from, 0);
 		to = std::min(to, int(_array.size() - 1));
 		for (auto i = from; i <= to; i++) {