diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e64a42916e..a44bc778e6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -237,8 +237,8 @@ android {
     buildConfigField("String", "STRIPE_BASE_URL", "\"https://api.stripe.com/v1\"")
     buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"")
     buildConfigField("boolean", "TRACING_ENABLED", "false")
-    buildConfigField("boolean", "MESSAGE_BACKUP_RESTORE_ENABLED", "false")
-    buildConfigField("boolean", "LINK_DEVICE_UX_ENABLED", "false")
+    buildConfigField("boolean", "MESSAGE_BACKUP_RESTORE_ENABLED", "true")
+    buildConfigField("boolean", "LINK_DEVICE_UX_ENABLED", "true")
 
     ndk {
       abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
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 71e33a5035..891f81ef69 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/BackupValues.kt
@@ -234,11 +234,6 @@ class BackupValues(store: KeyValueStore) : SignalStoreValues(store) {
       return MessageBackupTier.deserialize(getLong(KEY_BACKUP_TIER, -1))
     }
     set(value) {
-      // TODO [backup] Remove for launch
-      if (!RemoteConfig.internalUser && !Environment.IS_INSTRUMENTATION && value != null) {
-        throw IllegalStateException("Setting backup tier is only allowed for internal users!")
-      }
-
       Log.i(TAG, "Setting backup tier to $value", Throwable(), true)
       val serializedValue = MessageBackupTier.serialize(value)
       val storedValue = MessageBackupTier.deserialize(getLong(KEY_BACKUP_TIER, -1))
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
index 7d436c5002..ce88a0c540 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/RemoteConfig_StaticValuesTest.kt
@@ -49,7 +49,9 @@ class RemoteConfig_StaticValuesTest {
       "CRASH_PROMPT_CONFIG",
       "PROMPT_BATTERY_SAVER",
       "PROMPT_FOR_NOTIFICATION_LOGS",
-      "DEVICE_SPECIFIC_NOTIFICATION_CONFIG"
+      "DEVICE_SPECIFIC_NOTIFICATION_CONFIG",
+      "messageBackups",
+      "restoreAfterRegistration"
     )
 
     val publicVals: List<KProperty1<*, *>> = RemoteConfig::class.memberProperties