diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index 8a92e72cfb..bbf0e7a7f8 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -199,7 +199,7 @@
                 templateUrl: 'app/vault/views/vaultAddCipher.html',
                 controller: 'vaultAddCipherController',
                 resolve: {
-                    selectedFolder: function () { return grouping.folder ? grouping : null; },
+                    selectedFolder: function () { return grouping && grouping.folder ? grouping : null; },
                     checkedFavorite: function () { return favorite; }
                 }
             });