diff --git a/src/app/services/cipherService.js b/src/app/services/cipherService.js
index ed54988f2d..dd8e6dcd52 100644
--- a/src/app/services/cipherService.js
+++ b/src/app/services/cipherService.js
@@ -125,10 +125,10 @@ angular
                 property = cryptoService.decrypt(property, key);
             }
             catch (err) {
-                property = '[error: cannot decrypt]';
+                property = null;
             }
 
-            return property;
+            return property || '[error: cannot decrypt]';
         };
 
         _service.encryptLogins = function (unencryptedLogins, key) {