diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
index 63d642c65b..735f53c022 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -225,7 +225,7 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
     }
     set(value) {
       // TODO [backup] Remove for launch
-      if (!RemoteConfig.internalUser) {
+      if (!RemoteConfig.internalUser && value != null) {
         throw IllegalStateException("Setting backup tier is only allowed for internal users!")
       }