diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
index 30373f8dbb..b534e6c9d9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt
@@ -355,12 +355,9 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
 
         updateLegacyConfigView()
 
-        // TODO: remove this after enough updates that we can rely on ConfigBase.isNewConfigEnabled to always return true
-        // This will only run if we aren't using new configs, as they are schedule to sync when there are changes applied
-        if (textSecurePreferences.getConfigurationMessageSynced()) {
-            lifecycleScope.launch(Dispatchers.IO) {
-                ConfigurationMessageUtilities.syncConfigurationIfNeeded(this@HomeActivity)
-            }
+        // Sync config changes if there are any
+        lifecycleScope.launch(Dispatchers.IO) {
+            ConfigurationMessageUtilities.syncConfigurationIfNeeded(this@HomeActivity)
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/manager/CreateAccountManager.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/manager/CreateAccountManager.kt
index 960f53aa22..cdcbf75a73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/manager/CreateAccountManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/manager/CreateAccountManager.kt
@@ -45,7 +45,6 @@ class CreateAccountManager @Inject constructor(
 
         configFactory.keyPairChanged()
         configFactory.user?.setName(displayName)
-        ConfigurationMessageUtilities.forceSyncConfigurationNowIfNeeded(application)
 
         versionDataFetcher.startTimedVersionCheck()
     }