diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
index cff6ba8bf..39ea8c325 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Handlers/TagsPartHandler.cs
@@ -12,16 +12,6 @@ namespace Orchard.Tags.Handlers {
         public TagsPartHandler(IRepository<TagsPartRecord> repository, IRepository<TagRecord> tagsRepository, IRepository<ContentTagRecord> tagsContentItemsRepository) {
             Filters.Add(StorageFilter.For(repository));
  
-            OnLoading<TagsPart>((context, tags) => {
-                // populate list of attached tags on demand
-                tags._currentTags.Loader(list => {
-                    foreach(var tag in tagsContentItemsRepository.Fetch(x => x.TagsPartRecord.Id == context.ContentItem.Id))
-                        list.Add(tag.TagRecord);
-                    return list;
-                });
-
-            });
-
             OnRemoved<TagsPart>((context, tags) => {
                 tagsContentItemsRepository.Flush();
 
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Models/TagsPart.cs b/src/Orchard.Web/Modules/Orchard.Tags/Models/TagsPart.cs
index 899805ade..a24c82df3 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Models/TagsPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Models/TagsPart.cs
@@ -1,15 +1,9 @@
 using System.Collections.Generic;
+using System.Linq;
 using Orchard.ContentManagement;
-using Orchard.ContentManagement.Utilities;
 
 namespace Orchard.Tags.Models {
     public class TagsPart : ContentPart<TagsPartRecord> {
-        public TagsPart() {
-            CurrentTags = new List<TagRecord>();
-        }
-
-        public readonly LazyField<IList<TagRecord>> _currentTags = new LazyField<IList<TagRecord>>();
-
-        public IList<TagRecord> CurrentTags { get { return _currentTags.Value; } set { _currentTags.Value = value; } }
+        public IEnumerable<TagRecord> CurrentTags { get { return Record.Tags.Select(t => t.TagRecord); } }
     }
 }
\ No newline at end of file