diff --git a/ts/models/conversationAttributes.ts b/ts/models/conversationAttributes.ts
index e6ac2e19c..351e91766 100644
--- a/ts/models/conversationAttributes.ts
+++ b/ts/models/conversationAttributes.ts
@@ -91,7 +91,7 @@ export interface ConversationAttributes {
   profileKey?: string; // Consider this being a hex string if it is set
   triggerNotificationsFor: ConversationNotificationSettingType;
   avatarPointer?: string; // this is the url of the avatar on the file server v2. we use this to detect if we need to redownload the avatar from someone (not used for opengroups)
-  expireTimer: number;
+  expireTimer: number; // in seconds, 0 means no expiration
 
   members: Array<string>; // groups only members are all members for this group. zombies excluded (not used for communities)
   groupAdmins: Array<string>; // for sogs and closed group: the unique admins of that group
diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts
index b7d972a41..7cf51cd1d 100644
--- a/ts/models/messageType.ts
+++ b/ts/models/messageType.ts
@@ -27,7 +27,7 @@ export interface MessageAttributes {
   body?: string;
   // NOTE this is used for the logic
   expirationType?: DisappearingMessageType;
-  expireTimer: number;
+  expireTimer: number; // in seconds, 0 means no expiration
   expirationStartTimestamp: number;
   expires_at?: number;
   // NOTE this is used for conversation setting
diff --git a/ts/node/migration/helpers/v34.ts b/ts/node/migration/helpers/v34.ts
index b767ccbb8..4567b3285 100644
--- a/ts/node/migration/helpers/v34.ts
+++ b/ts/node/migration/helpers/v34.ts
@@ -106,8 +106,7 @@ function getContactInfoFromDBValues({
     expirationMode: expirationType
       ? (expirationType as DisappearingMessageConversationType)
       : undefined,
-    expirationTimerSeconds:
-      !!expireTimer && isFinite(expireTimer) && expireTimer > 0 ? expireTimer * 1000 : 0,
+    expirationTimerSeconds: !!expireTimer && expireTimer > 0 ? expireTimer : 0,
   };
 
   if (
@@ -151,7 +150,8 @@ function insertContactIntoContactWrapper(
       priority,
       dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
       expirationType: contact.expirationType || 'off',
-      expireTimer: contact.expirationTimer || 0,
+      // TODO rename expireTimer to expirationTimer
+      expireTimer: contact.expireTimer || 0,
     });
 
     try {
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 87cf45144..fb1a853eb 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -8,7 +8,7 @@ import {
   LegacyGroupMemberInfo,
 } from 'libsession_util_nodejs';
 import { from_hex } from 'libsodium-wrappers-sumo';
-import { isArray, isEmpty, isEqual, isFinite } from 'lodash';
+import { isArray, isEmpty, isEqual } from 'lodash';
 import { OpenGroupV2Room } from '../data/opengroups';
 import { ConversationAttributes } from '../models/conversationAttributes';
 import { OpenGroupRequestCommonType } from '../session/apis/open_group_api/opengroupV2/ApiUtil';
@@ -154,8 +154,7 @@ export function getContactInfoFromDBValues({
     expirationMode: expirationType
       ? (expirationType as DisappearingMessageConversationType)
       : undefined,
-    expirationTimerSeconds:
-      !!expireTimer && isFinite(expireTimer) && expireTimer > 0 ? expireTimer * 1000 : 0,
+    expirationTimerSeconds: !!expireTimer && expireTimer > 0 ? expireTimer : 0,
   };
 
   if (