diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
index e1318e574..6d5735624 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.cpp
@@ -54,10 +54,12 @@ namespace {
 } // namespace
 
 int MuteValue::until() const {
+	constexpr auto kMax = std::numeric_limits<int>::max();
+
 	return forever
-		? std::numeric_limits<int>::max()
+		? kMax
 		: (period > 0)
-		? (base::unixtime::now() + period)
+		? int(std::min(int64(base::unixtime::now()) + period, int64(kMax)))
 		: unmute
 		? 0
 		: -1;