diff --git a/src/services/cryptoService.js b/src/services/cryptoService.js
index 5a904361fa..90b70a0bfb 100644
--- a/src/services/cryptoService.js
+++ b/src/services/cryptoService.js
@@ -173,14 +173,13 @@ function initCryptoService(constantsService) {
     };
 
     CryptoService.prototype.getOrgKeys = function () {
-        var deferred = Q.defer();
-
         if (_orgKeys && _orgKeys.length) {
-            deferred.resolve(_orgKeys);
-            return deferred.promise;
+            return Q(_orgKeys);
         }
 
-        var self = this;
+        var self = this,
+            deferred = Q.defer();
+
         chrome.storage.local.get(encOrgKeysKey, function (obj) {
             if (obj && obj.encOrgKeys) {
                 var orgKeys = {},