diff --git a/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js b/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js
index de4521cb1..04c7b0e46 100644
--- a/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js
+++ b/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js
@@ -81,9 +81,17 @@ angular.module('portainer.app')
                 });
                 return $q.all(promises);
               })
-              .then(function success() {
+              .then(function success(data) {
                 Notifications.success('Success', 'Tags successfully deleted');
-                $state.reload();
+                if (data.length === 0) {
+                  $state.go('portainer.registries.registry.repositories', {
+                    id: $scope.registryId
+                  }, {
+                    reload: true
+                  });
+                } else {
+                  $state.reload();
+                }
               })
               .catch(function error(err) {
                 Notifications.error('Failure', err, 'Unable to delete tags');
@@ -127,9 +135,9 @@ angular.module('portainer.app')
           })
           .then(function success(data) {
             $scope.registry = data.registry;
-            $scope.repository.Tags = data.tags;
+            $scope.repository.Tags = [].concat(data.tags || []);
             $scope.tags = [];
-            for (var i = 0; i < data.tags.length; i++) {
+            for (var i = 0; i < $scope.repository.Tags.length; i++) {
               var tag = data.tags[i];
               RegistryV2Service.tag(registryId, repository, tag)
                 .then(function success(data) {