diff --git a/lib/client.js b/lib/client.js
index 4c12cbfb2..98e06c911 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -130,10 +130,15 @@ function MatrixClient(opts) {
         signatures[opts.userId]["ed25519:" + this.deviceId] = signature;
         this.deviceKeys.signatures = signatures;
 
+        var deviceInfo = {
+            keys: this.deviceKeys.keys,
+            algorithms: this.deviceKeys.algorithms,
+            verified: true,
+        };
         var myDevices = this.sessionStore.getEndToEndDevicesForUser(
             opts.userId
         ) || {};
-        myDevices[opts.deviceId] = this.deviceKeys;
+        myDevices[opts.deviceId] = deviceInfo;
         this.sessionStore.storeEndToEndDevicesForUser(
             opts.userId, myDevices
         );