diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts
index 2fb3ca525..eaf88607a 100644
--- a/ts/models/conversation.ts
+++ b/ts/models/conversation.ts
@@ -1074,6 +1074,13 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     shouldCommit?: boolean;
     existingMessage?: MessageModel;
   }): Promise<void> {
+    if (this.isPublic()) {
+      window.log.warning(
+        "WIP: updateExpireTimer() Disappearing messages aren't supported in communities"
+      );
+      return;
+    }
+
     let expirationType = providedExpirationType;
     let expireTimer = providedExpireTimer;
     const lastDisappearingMessageChangeTimestamp = providedChangeTimestamp;
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 94efa0853..ad451d12c 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -345,6 +345,13 @@ export function handleExpireUpdate(
   messageModel: MessageModel,
   expireUpdate: DisappearingMessageUpdate
 ) {
+  if (converationModel.isPublic()) {
+    window.log.warning(
+      "WIP: updateExpireTimer() Disappearing messages aren't supported in communities"
+    );
+    return messageModel;
+  }
+
   const {
     expirationType,
     // TODO renamed expireTimer to expirationTimer