diff --git a/ts/receiver/closedGroups.ts b/ts/receiver/closedGroups.ts
index 9ac7bb6f6..d2e6bd969 100644
--- a/ts/receiver/closedGroups.ts
+++ b/ts/receiver/closedGroups.ts
@@ -317,8 +317,14 @@ export async function handleNewClosedGroup(
       );
 
       // TODO This is only applicable for old closed groups - will be removed in future
+      // TODO legacy messages support will be removed in a future release
       await groupConvo.updateExpireTimer({
-        providedDisappearingMode: expireTimer === 0 ? 'off' : 'deleteAfterSend',
+        providedDisappearingMode:
+          expireTimer === 0
+            ? 'off'
+            : ReleasedFeatures.isDisappearMessageV2FeatureReleasedCached()
+            ? 'deleteAfterSend'
+            : 'legacy',
         providedExpireTimer: expireTimer,
         providedChangeTimestamp: GetNetworkTime.getNowWithNetworkOffset(),
         providedSource: sender,
diff --git a/ts/receiver/configMessage.ts b/ts/receiver/configMessage.ts
index 5bec42bfc..c4bdbb471 100644
--- a/ts/receiver/configMessage.ts
+++ b/ts/receiver/configMessage.ts
@@ -230,10 +230,13 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
     const wrapperNoteToSelfExpirySeconds = await UserConfigWrapperActions.getNoteToSelfExpiry();
 
     if (wrapperNoteToSelfExpirySeconds !== expireTimer) {
+      // TODO legacy messages support will be removed in a future release
       await ourConvo.updateExpireTimer({
         providedDisappearingMode:
           wrapperNoteToSelfExpirySeconds && wrapperNoteToSelfExpirySeconds > 0
-            ? 'deleteAfterSend'
+            ? ReleasedFeatures.isDisappearMessageV2FeatureReleasedCached()
+              ? 'deleteAfterSend'
+              : 'legacy'
             : 'off',
         providedExpireTimer: wrapperNoteToSelfExpirySeconds,
         providedChangeTimestamp: result.latestEnvelopeTimestamp,
@@ -246,7 +249,9 @@ async function handleUserProfileUpdate(result: IncomingConfResult): Promise<Inco
       window.log.debug(
         `WIP: [userProfileWrapper] updating disappearing messages to expiratonMode: ${
           wrapperNoteToSelfExpirySeconds && wrapperNoteToSelfExpirySeconds > 0
-            ? 'deleteAfterSend'
+            ? ReleasedFeatures.isDisappearMessageV2FeatureReleasedCached()
+              ? 'deleteAfterSend'
+              : 'legacy'
             : 'off'
         } wrapperNoteToSelfExpirySeconds: ${wrapperNoteToSelfExpirySeconds}`
       );