Merge pull request #4988 from matrix-org/uhoreg/fix_encryption_info

check that encryptionInfo.sender is set
matrix-org · Jul 15, 2020 · e1cf5ec · e1cf5ec
2 parents 7ab1416 + aa445a0
commit e1cf5ec
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
@@ -333,7 +333,7 @@ export default createReactClass({
             return;
         }
 
-        const eventSenderTrust = this.context.checkDeviceTrust(
+        const eventSenderTrust = encryptionInfo.sender && this.context.checkDeviceTrust(
             senderId, encryptionInfo.sender.deviceId,
         );
         if (!eventSenderTrust) {