diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
index a619abe627..fba1a8f4a5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageConverter.kt
@@ -384,7 +384,7 @@ object GroupsV2UpdateMessageConverter {
       updates.add(
         GroupChangeChatUpdate.Update(
           groupExpirationTimerUpdate = GroupExpirationTimerUpdate(
-            expiresInMs = change.newTimer!!.duration * 1000,
+            expiresInMs = (change.newTimer!!.duration * 1000L).toUInt().toInt(),
             updaterAci = if (editorUnknown) null else change.editorServiceIdBytes
           )
         )
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
index 55f2bdf93f..dd47adc0e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
@@ -234,7 +234,7 @@ final class GroupsV2UpdateMessageProducer {
     }
   }
   private void describeGroupExpirationTimerUpdate(@NonNull GroupExpirationTimerUpdate update, @NonNull List<UpdateDescription> updates) {
-    final int duration = update.expiresInMs / 1000;
+    final int duration = Math.toIntExact(Integer.toUnsignedLong(update.expiresInMs) / 1000);
     String time = ExpirationUtil.getExpirationDisplayValue(context, duration);
     if (update.updaterAci == null) {
       updates.add(updateDescription(context.getString(R.string.MessageRecord_disappearing_message_time_set_to_s, time), R.drawable.ic_update_timer_16));