diff --git a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
index dcff0ea032..3a85d5a109 100644
--- a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
+++ b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
@@ -329,7 +329,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                 let messagePeer = message.peers[message.id.peerId]
                 
                 if timeout > 0 {
-                    let timeValue = timeIntervalString(strings: strings, value: timeout, preferLowerValue: true)
+                    let timeValue = timeIntervalString(strings: strings, value: timeout, preferLowerValue: false)
                     
                     let string: String
                     if let _ = messagePeer as? TelegramUser {
diff --git a/submodules/TelegramUI/Sources/ChatTimerScreen.swift b/submodules/TelegramUI/Sources/ChatTimerScreen.swift
index d7d1ded606..3d92fbd4c8 100644
--- a/submodules/TelegramUI/Sources/ChatTimerScreen.swift
+++ b/submodules/TelegramUI/Sources/ChatTimerScreen.swift
@@ -422,7 +422,7 @@ class ChatTimerScreenNode: ViewControllerTracingNode, UIScrollViewDelegate, UIPi
                     case .sendTimer:
                         strongSelf.completion?(timerValues[pickerView.selectedRow(inComponent: 0)])
                     case .autoremove:
-                        let timeInterval = pickerView.selectedRow(inComponent: 0) * 24 * 60 * 60 + pickerView.selectedRow(inComponent: 1) * 60 * 60 + pickerView.selectedRow(inComponent: 2) * 60
+                        let timeInterval = strongSelf.autoremoveTimerValues[pickerView.selectedRow(inComponent: 0)]
                         strongSelf.completion?(Int32(timeInterval))
                     case .mute:
                         break