diff --git a/js/libtextsecure.js b/js/libtextsecure.js
index 6a5b48824..7b9410fff 100644
--- a/js/libtextsecure.js
+++ b/js/libtextsecure.js
@@ -38458,11 +38458,15 @@ MessageReceiver.prototype.extend({
         // Note that messages may (generally) only perform one action and we ignore remaining fields
         // after the first action.
 
-        if (decrypted.flags == null)
+        if (decrypted.flags == null) {
             decrypted.flags = 0;
+        }
+        if (decrypted.expireTimer == null) {
+            decrypted.expireTimer = 0;
+        }
 
-        if ((decrypted.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
-                    == textsecure.protobuf.DataMessage.Flags.END_SESSION) {
+        if (decrypted.flags & (   textsecure.protobuf.DataMessage.Flags.END_SESSION
+                                | textsecure.protobuf.DataMessage.Flags.EXPIRATION_TIMER_UPDATE )) {
             decrypted.body = null;
             decrypted.attachments = [];
             decrypted.group = null;
diff --git a/libtextsecure/message_receiver.js b/libtextsecure/message_receiver.js
index fd7fd6186..7878f4908 100644
--- a/libtextsecure/message_receiver.js
+++ b/libtextsecure/message_receiver.js
@@ -387,11 +387,15 @@ MessageReceiver.prototype.extend({
         // Note that messages may (generally) only perform one action and we ignore remaining fields
         // after the first action.
 
-        if (decrypted.flags == null)
+        if (decrypted.flags == null) {
             decrypted.flags = 0;
+        }
+        if (decrypted.expireTimer == null) {
+            decrypted.expireTimer = 0;
+        }
 
-        if ((decrypted.flags & textsecure.protobuf.DataMessage.Flags.END_SESSION)
-                    == textsecure.protobuf.DataMessage.Flags.END_SESSION) {
+        if (decrypted.flags & (   textsecure.protobuf.DataMessage.Flags.END_SESSION
+                                | textsecure.protobuf.DataMessage.Flags.EXPIRATION_TIMER_UPDATE )) {
             decrypted.body = null;
             decrypted.attachments = [];
             decrypted.group = null;