diff --git a/AltStore/Managing Apps/AppManager.swift b/AltStore/Managing Apps/AppManager.swift
index 9dd5104b..56b9184d 100644
--- a/AltStore/Managing Apps/AppManager.swift	
+++ b/AltStore/Managing Apps/AppManager.swift	
@@ -1017,7 +1017,7 @@ private extension AppManager
     
     func removeAppExtensions(from application: ALTApplication, extensions: Set<ALTApplication>, _ presentingViewController: UIViewController, completion: @escaping (Result<Void, Error>) -> Void)
     {
-        guard !application.appExtensions.isEmpty else { return completion(.success(())) }
+        guard !application.appExtensions.isEmpty, !UserDefaults.standard.isAppLimitDisabled else { return completion(.success(())) }
         
         let firstSentence: String
         
diff --git a/AltStore/Settings/SettingsViewController.swift b/AltStore/Settings/SettingsViewController.swift
index 0d61a2af..f69b033f 100644
--- a/AltStore/Settings/SettingsViewController.swift
+++ b/AltStore/Settings/SettingsViewController.swift
@@ -331,6 +331,7 @@ private extension SettingsViewController
     @IBAction func toggleDisableAppLimit(_ sender: UISwitch) {
         UserDefaults.standard.isAppLimitDisabled = sender.isOn
         UserDefaults.standard.activeAppsLimit = sender.isOn ? Int.max : ALTActiveAppsLimit
+        UserDefaults.standard.activeAppLimitIncludesExtensions = !sender.isOn
     }
     
     @IBAction func toggleIsBackgroundRefreshEnabled(_ sender: UISwitch)