diff --git a/src/app/vault/vaultSharedController.js b/src/app/vault/vaultSharedController.js
index 9a614a5ced..c0a3a67f86 100644
--- a/src/app/vault/vaultSharedController.js
+++ b/src/app/vault/vaultSharedController.js
@@ -127,10 +127,8 @@
             modal.result.then(function (response) {
                 if (response.collectionIds) {
                     login.collectionIds = response.collectionIds;
-
-                    if (!response.collectionIds.length) {
-                        removeRootLogin(findRootLogin(login));
-                    }
+                    // TODO: if there are no collectionIds now, it is possible that the user no longer has access to this login
+                    // which means it should be removed by calling removeRootLogin(findRootLogin(login))
                 }
             });
         };
@@ -154,9 +152,8 @@
             apiService.ciphers.putCollections({ id: login.id }, request).$promise.then(function (response) {
                 $analytics.eventTrack('Removed From Collection');
                 login.collectionIds = request.collectionIds;
-                if (!login.collectionIds.length) {
-                    removeRootLogin(findRootLogin(login));
-                }
+                // TODO: if there are no collectionIds now, it is possible that the user no longer has access to this login
+                // which means it should be removed by calling removeRootLogin(findRootLogin(login))
             });
         };
 
diff --git a/src/app/vault/views/vaultShared.html b/src/app/vault/views/vaultShared.html
index 150587d42f..68536c610f 100644
--- a/src/app/vault/views/vaultShared.html
+++ b/src/app/vault/views/vaultShared.html
@@ -68,7 +68,8 @@
                                             </a>
                                         </li>
                                         <li>
-                                            <a href="javascript:void(0)" ng-click="removeLogin(login, collection)" class="text-red">
+                                            <a href="javascript:void(0)" ng-click="removeLogin(login, collection)"
+                                               ng-if="collection.id" class="text-red">
                                                 <i class="fa fa-fw fa-remove"></i> Remove
                                             </a>
                                         </li>