diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 2a2bb6e4f..91534716a 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -357,9 +357,9 @@ async function commitProfileEdits(newName: string, scaledAvatarUrl: string | nul
 
   // might be good to not trigger a sync if the name did not change
   await conversation.commit();
+  await ConfigurationSync.queueNewJobIfNeeded();
 
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    await ConfigurationSync.queueNewJobIfNeeded();
     await setLastProfileUpdateTimestamp(Date.now());
   } else {
     await setLastProfileUpdateTimestamp(Date.now());
diff --git a/ts/interactions/conversationInteractions.ts b/ts/interactions/conversationInteractions.ts
index 1fb23818a..db97cd6ed 100644
--- a/ts/interactions/conversationInteractions.ts
+++ b/ts/interactions/conversationInteractions.ts
@@ -148,15 +148,13 @@ export async function declineConversationWithoutConfirm({
   if (blockContact) {
     await blockConvoById(conversationId);
   }
-  if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    // when removing a message request, without blocking it, we actually have no need to store the conversation in the wrapper. So just remove the entry
-
-    if (
-      conversationToDecline.isPrivate() &&
-      !SessionUtilContact.isContactToStoreInWrapper(conversationToDecline)
-    ) {
-      await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id);
-    }
+  // when removing a message request, without blocking it, we actually have no need to store the conversation in the wrapper. So just remove the entry
+
+  if (
+    conversationToDecline.isPrivate() &&
+    !SessionUtilContact.isContactToStoreInWrapper(conversationToDecline)
+  ) {
+    await SessionUtilContact.removeContactFromWrapper(conversationToDecline.id);
   }
 
   if (syncToDevices) {
@@ -462,9 +460,9 @@ export async function uploadOurAvatar(newAvatarDecrypted?: ArrayBuffer) {
 
   if (newAvatarDecrypted) {
     await setLastProfileUpdateTimestamp(Date.now());
-    if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      await ConfigurationSync.queueNewJobIfNeeded();
-    } else {
+    await ConfigurationSync.queueNewJobIfNeeded();
+
+    if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
       await SyncUtils.forceSyncConfigurationNowIfNeeded(true);
     }
   } else {
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index c81bf2e1f..e5dd33b94 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -736,7 +736,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
     await handleClosedGroupsFromConfigLegacy(configMessage.closedGroups, envelope);
   }
 
-  handleOpenGroupsFromConfig(configMessage.openGroups);
+  handleOpenGroupsFromConfigLegacy(configMessage.openGroups);
 
   if (configMessage.contacts?.length) {
     await Promise.all(
@@ -749,7 +749,7 @@ async function handleGroupsAndContactsFromConfigMessageLegacy(
  * Trigger a join for all open groups we are not already in.
  * @param openGroups string array of open group urls
  */
-const handleOpenGroupsFromConfig = (openGroups: Array<string>) => {
+const handleOpenGroupsFromConfigLegacy = (openGroups: Array<string>) => {
   if (window.sessionFeatureFlags.useSharedUtilForUserConfig && Registration.isDone()) {
     return;
   }
diff --git a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
index 70317638c..04379a610 100644
--- a/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
+++ b/ts/session/utils/job_runners/jobs/ConfigurationSyncJob.ts
@@ -280,9 +280,6 @@ class ConfigurationSyncJob extends PersistedJob<ConfigurationSyncPersistedData>
  * A ConfigurationSyncJob can only be added if there is none of the same type queued already.
  */
 async function queueNewJobIfNeeded() {
-  if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-    return;
-  }
   if (
     !lastRunConfigSyncJobTimestamp ||
     lastRunConfigSyncJobTimestamp < Date.now() - defaultMsBetweenRetries
diff --git a/ts/session/utils/sync/syncUtils.ts b/ts/session/utils/sync/syncUtils.ts
index 4be280ffc..fe4f91b26 100644
--- a/ts/session/utils/sync/syncUtils.ts
+++ b/ts/session/utils/sync/syncUtils.ts
@@ -44,6 +44,8 @@ const writeLastSyncTimestampToDb = async (timestamp: number) =>
  * Conditionally Syncs user configuration with other devices linked.
  */
 export const syncConfigurationIfNeeded = async () => {
+  await ConfigurationSync.queueNewJobIfNeeded();
+
   if (!window.sessionFeatureFlags.useSharedUtilForUserConfig) {
     const lastSyncedTimestamp = (await getLastSyncTimestampFromDb()) || 0;
     const now = Date.now();
@@ -70,8 +72,6 @@ export const syncConfigurationIfNeeded = async () => {
       return;
     }
     await writeLastSyncTimestampToDb(now);
-  } else {
-    await ConfigurationSync.queueNewJobIfNeeded();
   }
 };
 
@@ -83,22 +83,23 @@ export const forceSyncConfigurationNowIfNeeded = async (waitForMessageSent = fal
       resolve(false);
     }, 20000);
 
+    // the ConfigurationSync also handles dumping in to the DB if we do not need to push the data, but the dumping needs to be done even before the feature flag is true.
+    void ConfigurationSync.queueNewJobIfNeeded().catch(e => {
+      window.log.warn(
+        'forceSyncConfigurationNowIfNeeded scheduling of jobs ConfigurationSync.queueNewJobIfNeeded failed with: ',
+        e.message
+      );
+    });
     if (window.sessionFeatureFlags.useSharedUtilForUserConfig) {
-      void ConfigurationSync.queueNewJobIfNeeded().catch(e => {
-        window.log.warn(
-          'forceSyncConfigurationNowIfNeeded scheduling of jobs failed with',
-          e.message
-        );
-      });
       if (waitForMessageSent) {
         window.Whisper.events.once(ConfigurationSyncJobDone, () => {
           resolve(true);
+          return;
         });
       } else {
         resolve(true);
+        return;
       }
-
-      return;
     }
 
     void getCurrentConfigurationMessage(allConvos)