diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.kt
index 0017f6e373..f830d763a6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.kt
@@ -161,9 +161,11 @@ class StickerManagementViewModel : ViewModel() {
   fun toggleSelection(pack: InstalledStickerPack) {
     _uiState.update { previousState ->
       val wasItemSelected = previousState.selectedPackIds.contains(pack.id)
+      val selectedPackIds = if (wasItemSelected) previousState.selectedPackIds.minus(pack.id) else previousState.selectedPackIds.plus(pack.id)
+
       previousState.copy(
-        multiSelectEnabled = true,
-        selectedPackIds = if (wasItemSelected) previousState.selectedPackIds.minus(pack.id) else previousState.selectedPackIds.plus(pack.id)
+        multiSelectEnabled = selectedPackIds.isNotEmpty(),
+        selectedPackIds = selectedPackIds
       )
     }
   }