diff --git a/submodules/TelegramCore/Sources/SyncCore/SyncCore_CacheStorageSettings.swift b/submodules/TelegramCore/Sources/SyncCore/SyncCore_CacheStorageSettings.swift
index 407f75e6b1..fba883b466 100644
--- a/submodules/TelegramCore/Sources/SyncCore/SyncCore_CacheStorageSettings.swift
+++ b/submodules/TelegramCore/Sources/SyncCore/SyncCore_CacheStorageSettings.swift
@@ -21,7 +21,7 @@ public struct CacheStorageSettings: Codable, Equatable {
     public static var defaultSettings: CacheStorageSettings {
         return CacheStorageSettings(
             defaultCacheStorageTimeout: Int32.max,
-            defaultCacheStorageLimitGigabytes: 8 * 1024 * 1024,
+            defaultCacheStorageLimitGigabytes: Int32.max,
             categoryStorageTimeout: [
                 .privateChats: Int32.max,
                 .groups: Int32(31 * 24 * 60 * 60),
@@ -50,7 +50,7 @@ public struct CacheStorageSettings: Codable, Equatable {
         } else if let value = try container.decodeIfPresent(Int32.self, forKey: "sizeLimit") {
             self.defaultCacheStorageLimitGigabytes = value
         } else {
-            self.defaultCacheStorageLimitGigabytes = 8 * 1024 * 1024
+            self.defaultCacheStorageLimitGigabytes = Int32.max
         }
         
         if let data = try container.decodeIfPresent(Data.self, forKey: "categoryStorageTimeoutJson") {
diff --git a/submodules/TelegramUI/Components/StorageUsageScreen/Sources/StorageUsageScreen.swift b/submodules/TelegramUI/Components/StorageUsageScreen/Sources/StorageUsageScreen.swift
index b892fbb1e0..de20a66069 100644
--- a/submodules/TelegramUI/Components/StorageUsageScreen/Sources/StorageUsageScreen.swift
+++ b/submodules/TelegramUI/Components/StorageUsageScreen/Sources/StorageUsageScreen.swift
@@ -1903,7 +1903,7 @@ final class StorageUsageScreenComponent: Component {
                     component: AnyComponent(StorageKeepSizeComponent(
                         theme: environment.theme,
                         strings: environment.strings,
-                        value: cacheSettings?.defaultCacheStorageLimitGigabytes ?? 32,
+                        value: cacheSettings?.defaultCacheStorageLimitGigabytes ?? 16,
                         updateValue: { [weak self] value in
                             guard let self, let component = self.component else {
                                 return
@@ -3143,7 +3143,7 @@ final class StorageUsageScreenComponent: Component {
                 for value in presetValues {
                     let optionText: String
                     if value == Int32.max {
-                        optionText = presentationData.strings.ClearCache_Forever
+                        optionText = presentationData.strings.ClearCache_Never
                     } else {
                         optionText = timeIntervalString(strings: presentationData.strings, value: value)
                     }