diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 14f412471..da728dfd1 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -245,7 +245,7 @@ export async function handleSwarmDataMessage(
 
   if (expireUpdate && !isEmpty(expireUpdate)) {
     if (isSyncedMessage) {
-      // TODO handle sync messages expiring separately
+      // TODO handle sync messages expiring separately?
       window.log.info('WIP: Sync Message dropping');
     } else {
       msgModel = handleExpireUpdate(convoToAddMessageTo, msgModel, expireUpdate);
diff --git a/ts/session/messages/outgoing/ExpirableMessage.ts b/ts/session/messages/outgoing/ExpirableMessage.ts
index ce11e1aa2..2ae95b14b 100644
--- a/ts/session/messages/outgoing/ExpirableMessage.ts
+++ b/ts/session/messages/outgoing/ExpirableMessage.ts
@@ -33,6 +33,7 @@ export class ExpirableMessage extends ContentMessage {
           : this.expirationType === 'legacy'
           ? SignalService.Content.ExpirationType.UNKNOWN
           : undefined,
+      // TODO could use isFinite?
       expirationTimer: this.expireTimer && this.expireTimer > -1 ? this.expireTimer : undefined,
     });
   }
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 06055bda0..feee80527 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -310,6 +310,7 @@ export async function checkForExpireUpdate(
     ? Number(content.lastDisappearingMessageChangeTimestamp)
     : undefined;
 
+  // TODO should review this
   const shouldDisappearButIsntMessage =
     dataMessage.flags !== SignalService.DataMessage.Flags.EXPIRATION_TIMER_UPDATE &&
     expirationType === 'off' &&