diff --git a/src/components/views/settings/KeyBackupPanel.js b/src/components/views/settings/KeyBackupPanel.js
index cc1b3fd017..7667e11d46 100644
--- a/src/components/views/settings/KeyBackupPanel.js
+++ b/src/components/views/settings/KeyBackupPanel.js
@@ -221,17 +221,24 @@ export default class KeyBackupPanel extends React.PureComponent {
{sub}
;
const device = sub => {deviceName};
+ const fromThisDevice = sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key();
let sigStatus;
if (!sig.device) {
sigStatus = _t(
"Backup has a signature from unknown device with ID %(deviceId)s.",
{ deviceId: sig.deviceId }, { verify },
);
- } else if (sig.device.getFingerprint() === MatrixClientPeg.get().getDeviceEd25519Key()) {
+ } else if (sig.valid && fromThisDevice) {
sigStatus = _t(
"Backup has a valid signature from this device",
{}, { validity },
);
+ } else if (!sig.valid && fromThisDevice) {
+ // it can happen...
+ sigStatus = _t(
+ "Backup has an invalid signature from this device",
+ {}, { validity },
+ );
} else if (sig.valid && sig.device.isVerified()) {
sigStatus = _t(
"Backup has a valid signature from " +