diff --git a/js/app/controllers/credential.js b/js/app/controllers/credential.js
index 2c4a8c7f..0325811d 100644
--- a/js/app/controllers/credential.js
+++ b/js/app/controllers/credential.js
@@ -287,6 +287,9 @@ angular.module('passmanApp')
 
 			$scope.filtered_credentials = [];
 			$scope.$watch('[selectedtags, filterOptions, delete_time, active_vault.credentials]', function(){
+				if(!$scope.active_vault){
+					return;
+				}
 				if($scope.active_vault.credentials) {
 					var credentials = angular.copy($scope.active_vault.credentials);
 					var filtered_credentials = $filter('credentialSearch')(credentials, $scope.filterOptions);