diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt
index 865fd8ed75..c682a13cfc 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/AddonViewModel.kt
@@ -72,21 +72,15 @@ class AddonViewModel : ViewModel() {
         val enabledUpdates = updates.filter { it.enabled }
 
         if (enabledUpdates.size > 1) {
-            var foundFirst = false
-            for (patch in patchList) {
-                if (PatchType.from(patch.type) == PatchType.Update) {
-                    if (!foundFirst && patch.enabled) {
-                        foundFirst = true
-                    } else if (foundFirst && patch.enabled) {
-                        patch.enabled = false
-                    }
-                }
+            val nandOrSdmcEnabled = enabledUpdates.find {
+                it.name.contains("(NAND)") || it.name.contains("(SDMC)")
             }
-        } else if (enabledUpdates.isEmpty()) {
+
+            val updateToKeep = nandOrSdmcEnabled ?: enabledUpdates.first()
+
             for (patch in patchList) {
                 if (PatchType.from(patch.type) == PatchType.Update) {
-                    patch.enabled = true
-                    break
+                    patch.enabled = (patch === updateToKeep)
                 }
             }
         }
@@ -143,9 +137,14 @@ class AddonViewModel : ViewModel() {
                 if (it.enabled) {
                     null
                 } else {
-                    // For multiple updates, use "Update@{numericVersion}" as the key (like desktop)
-                    if (hasMultipleUpdates && PatchType.from(it.type) == PatchType.Update) {
-                        "Update@${it.numericVersion}"
+                    if (PatchType.from(it.type) == PatchType.Update) {
+                        if (it.name.contains("(NAND)") || it.name.contains("(SDMC)")) {
+                            it.name
+                        } else if (hasMultipleUpdates) {
+                            "Update@${it.numericVersion}"
+                        } else {
+                            it.name
+                        }
                     } else {
                         it.name
                     }
diff --git a/src/core/file_sys/patch_manager.cpp b/src/core/file_sys/patch_manager.cpp
index 5975e62606..bdc484b70c 100644
--- a/src/core/file_sys/patch_manager.cpp
+++ b/src/core/file_sys/patch_manager.cpp
@@ -785,7 +785,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
 
             std::string patch_name = "Update" + source_suffix;
 
-            const auto update_disabled =
+            bool update_disabled =
                 std::find(disabled.cbegin(), disabled.cend(), patch_name) != disabled.cend();
 
             Patch update_patch = {.enabled = !update_disabled,
@@ -804,7 +804,7 @@ std::vector<Patch> PatchManager::GetPatches(VirtualFile update_raw) const {
         const auto metadata = update.GetControlMetadata();
         const auto& nacp = metadata.first;
 
-        const auto update_disabled =
+        bool update_disabled =
             std::find(disabled.cbegin(), disabled.cend(), "Update") != disabled.cend();
         Patch update_patch = {.enabled = !update_disabled,
                               .name = "Update",