diff --git a/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs b/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs
index f317a02ff..f47d2162f 100644
--- a/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs
+++ b/MediaBrowser.Controller/Entities/IHasSpecialFeatures.cs
@@ -10,9 +10,9 @@ namespace MediaBrowser.Controller.Entities
     public interface IHasSpecialFeatures
     {
         /// <summary>
-        /// Gets or sets the special feature ids.
+        /// Gets the special feature ids.
         /// </summary>
         /// <value>The special feature ids.</value>
-        IReadOnlyList<Guid> SpecialFeatureIds { get; set; }
+        IReadOnlyList<Guid> SpecialFeatureIds { get; }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 6f1a0a8cf..dfaf03fda 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -19,24 +19,11 @@ namespace MediaBrowser.Controller.Entities.Movies
     /// </summary>
     public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasLookupInfo<MovieInfo>, ISupportsBoxSetGrouping
     {
-        private IReadOnlyList<Guid> _specialFeatureIds;
-
         /// <inheritdoc />
-        public IReadOnlyList<Guid> SpecialFeatureIds
-        {
-            get
-            {
-                return _specialFeatureIds ??= GetExtras()
-                    .Where(extra => extra.ExtraType != Model.Entities.ExtraType.Trailer)
-                    .Select(song => song.Id)
-                    .ToArray();
-            }
-
-            set
-            {
-                _specialFeatureIds = value;
-            }
-        }
+        public IReadOnlyList<Guid> SpecialFeatureIds => GetExtras()
+            .Where(extra => extra.ExtraType != null && extra is Video)
+            .Select(extra => extra.Id)
+            .ToArray();
 
         /// <inheritdoc />
         public IReadOnlyList<BaseItem> LocalTrailers => GetExtras()