diff --git a/AltStore/App IDs/AppIDsViewController.swift b/AltStore/App IDs/AppIDsViewController.swift
index 450984df..8030e6c9 100644
--- a/AltStore/App IDs/AppIDsViewController.swift	
+++ b/AltStore/App IDs/AppIDsViewController.swift	
@@ -96,16 +96,7 @@ private extension AppIDsViewController
                 formatter.includesApproximationPhrase = false
                 formatter.includesTimeRemainingPhrase = false
                 formatter.allowedUnits = [.minute, .hour, .day]
-                
-                let numberOfDays = expirationDate.numberOfCalendarDays(since: Date())
-
-                
-                switch numberOfDays
-                {
-                case 1...: formatter.allowedUnits = [.day]
-                case 0: formatter.allowedUnits = [.hour, .minute]
-                default: formatter.allowedUnits = [.day]
-                }
+                formatter.maximumUnitCount = 1
                 
                 cell.bannerView.button.setTitle(formatter.string(from: Date(), to: expirationDate)?.uppercased(), for: .normal)
                 
diff --git a/AltStore/My Apps/MyAppsViewController.swift b/AltStore/My Apps/MyAppsViewController.swift
index f9360e33..cf16a87d 100644
--- a/AltStore/My Apps/MyAppsViewController.swift	
+++ b/AltStore/My Apps/MyAppsViewController.swift	
@@ -334,12 +334,10 @@ private extension MyAppsViewController
             formatter.unitsStyle = .full
             formatter.includesApproximationPhrase = false
             formatter.includesTimeRemainingPhrase = false
-            switch numberOfDays
-            {
-            case 1...: formatter.allowedUnits = [.day]
-            case 0: formatter.allowedUnits = [.hour, .minute]
-            default: formatter.allowedUnits = [.day]
-            }
+            
+            formatter.allowedUnits = [.day, .hour, .minute]
+
+            formatter.maximumUnitCount = 1