diff --git a/ts/session/disappearing_messages/index.ts b/ts/session/disappearing_messages/index.ts
index dc90c3912..85adb33b8 100644
--- a/ts/session/disappearing_messages/index.ts
+++ b/ts/session/disappearing_messages/index.ts
@@ -448,10 +448,11 @@ export function getMessageReadyToDisappear(
   }
 
   if (conversationModel.isPublic()) {
-    window.log.warn(
-      "getMessageReadyToDisappear() Disappearing messages aren't supported in communities"
+    throw Error(
+      `getMessageReadyToDisappear() Disappearing messages aren't supported in communities. Message id: ${messageModel.get(
+        'id'
+      )}`
     );
-    return messageModel;
   }
 
   const {