4 files changed, 40 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index d3085cb68..7d54e012c 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -20,7 +20,8 @@ namespace MediaBrowser.Controller.Entities.Audio
         IHasMusicGenres,
         IHasLookupInfo<SongInfo>,
         IHasTags,
-        IHasMediaSources
+        IHasMediaSources,
+        IThemeMedia
     {
         public string FormatName { get; set; }
         public long? Size { get; set; }
@@ -28,6 +29,8 @@ namespace MediaBrowser.Controller.Entities.Audio
         public int? TotalBitrate { get; set; }
         public List<string> Tags { get; set; }
 
+        public bool IsThemeMedia { get; set; }
+
         public Audio()
         {
             Artists = new List<string>();
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index e718a53ff..fd7a33ddf 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -749,7 +749,18 @@ namespace MediaBrowser.Controller.Entities
 
             var themeVideosChanged = !item.ThemeVideoIds.SequenceEqual(newThemeVideoIds);
 
-            var tasks = newThemeVideos.Select(i => i.RefreshMetadata(options, cancellationToken));
+            var tasks = newThemeVideos.Select(i =>
+            {
+                var subOptions = new MetadataRefreshOptions(options);
+
+                if (!i.IsThemeMedia)
+                {
+                    i.IsThemeMedia = true;
+                    subOptions.ForceSave = true;
+                }
+
+                return i.RefreshMetadata(subOptions, cancellationToken);
+            });
 
             await Task.WhenAll(tasks).ConfigureAwait(false);
 
@@ -768,7 +779,18 @@ namespace MediaBrowser.Controller.Entities
 
             var themeSongsChanged = !item.ThemeSongIds.SequenceEqual(newThemeSongIds);
 
-            var tasks = newThemeSongs.Select(i => i.RefreshMetadata(options, cancellationToken));
+            var tasks = newThemeSongs.Select(i =>
+            {
+                var subOptions = new MetadataRefreshOptions(options);
+
+                if (!i.IsThemeMedia)
+                {
+                    i.IsThemeMedia = true;
+                    subOptions.ForceSave = true;
+                }
+
+                return i.RefreshMetadata(subOptions, cancellationToken);
+            });
 
             await Task.WhenAll(tasks).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Controller/Entities/IThemeMedia.cs b/MediaBrowser.Controller/Entities/IThemeMedia.cs
new file mode 100644
index 000000000..b2eff230f
--- /dev/null
+++ b/MediaBrowser.Controller/Entities/IThemeMedia.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Controller.Entities
+{
+    public interface IThemeMedia
+    {
+        bool IsThemeMedia { get; }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index ff4c5dd90..ea530272d 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -24,7 +24,8 @@ namespace MediaBrowser.Controller.Entities
         IHasTags, 
         ISupportsPlaceHolders,
         IHasMediaSources,
-        IHasShortOverview
+        IHasShortOverview,
+        IThemeMedia
     {
         public bool IsMultiPart { get; set; }
         public bool HasLocalAlternateVersions { get; set; }
@@ -33,6 +34,8 @@ namespace MediaBrowser.Controller.Entities
         public List<Guid> AdditionalPartIds { get; set; }
         public List<Guid> LocalAlternateVersionIds { get; set; }
 
+        public bool IsThemeMedia { get; set; }
+        
         public string FormatName { get; set; }
         public long? Size { get; set; }
         public string Container { get; set; }