diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs b/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
index b78a1e1b8..0b025de03 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
@@ -86,6 +86,10 @@ namespace Orchard.Tags.Services {
 
             // new tag name already existing => merge
             if (tagRecord != null) {
+                // If updating ourselves, ignore
+                if (tagRecord.Id == tagId)
+                    return;
+
                 var tagsContentItems = _contentTagRepository.Fetch(x => x.TagRecord.Id == tagId);
 
                 // get contentItems already tagged with the existing one