diff --git a/src/keyring/localstore.js b/src/keyring/localstore.js
index 64faa7a2..587a0430 100644
--- a/src/keyring/localstore.js
+++ b/src/keyring/localstore.js
@@ -42,7 +42,7 @@ LocalStore.prototype.load = function () {
   if (armoredKeys !== null && armoredKeys.length !== 0) {
     var key;
     for (var i = 0; i < armoredKeys.length; i++) {
-      key = openpgp.key.readArmored(armoredKeys[i]);
+      key = openpgp.key.readArmored(armoredKeys[i]).keys[0];
       keys.push(key);
     }
   }
diff --git a/test/general/keyring.js b/test/general/keyring.js
index 0d7829cf..31979f90 100644
--- a/test/general/keyring.js
+++ b/test/general/keyring.js
@@ -77,6 +77,15 @@ describe("Keyring", function() {
     expect(keys).to.exist.and.have.length(1);
     done();
   });
+  it('store keys in localstorage', function(done){
+    keyring.store();
+    done();
+  });
+  it('after loading from localstorage: getKeysForKeyId() - valid id', function(done) {
+    var keyring = new openpgp.Keyring(),
+      keys = keyring.getKeysForKeyId(keyId.toLowerCase());
+    expect(keys).to.exist.and.have.length(1);
+    done();
+  });
 });
 
-