diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index bd7d308584..c3e24090c3 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -21,11 +21,11 @@ namespace MediaBrowser.Controller.Entities
             Taglines = new List<string>();
             Keywords = new List<string>();
             ProductionLocations = new List<string>();
-            TrailerTypes = new List<TrailerType>();
+            TrailerTypes = new List<TrailerType> { TrailerType.LocalTrailer };
         }
 
         public List<TrailerType> TrailerTypes { get; set; }
-        
+
         public float? Metascore { get; set; }
 
         public List<MediaUrl> RemoteTrailers { get; set; }
@@ -86,7 +86,7 @@ namespace MediaBrowser.Controller.Entities
             var info = GetItemLookupInfo<TrailerInfo>();
 
             info.IsLocalTrailer = TrailerTypes.Contains(TrailerType.LocalTrailer);
-            
+
             if (!IsInMixedFolder)
             {
                 info.Name = System.IO.Path.GetFileName(ContainingFolderPath);
diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
index 49012c65af..9ebae5d913 100644
--- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
+++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
@@ -102,10 +102,15 @@ namespace MediaBrowser.Server.Implementations.Intros
 
             if (trailerTypes.Count > 0)
             {
+                var excludeTrailerTypes = Enum.GetNames(typeof(TrailerType))
+                        .Select(i => (TrailerType)Enum.Parse(typeof(TrailerType), i, true))
+                        .Except(trailerTypes)
+                        .ToArray();
+
                 var trailerResult = _libraryManager.GetItemList(new InternalItemsQuery
                 {
                     IncludeItemTypes = new[] { typeof(Trailer).Name },
-                    TrailerTypes = trailerTypes.ToArray()
+                    ExcludeTrailerTypes = excludeTrailerTypes
                 });
 
                 candidates.AddRange(trailerResult.Select(i => new ItemWithTrailer
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 28671fb7ca..ccba293a38 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -2361,6 +2361,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     }
 
                     video.ExtraType = ExtraType.Trailer;
+                    video.TrailerTypes = new List<TrailerType> { TrailerType.LocalTrailer };
 
                     return video;
 
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 4a72359284..de914b7739 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -79,7 +79,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
         private IDbCommand _updateInheritedRatingCommand;
 
-        private const int LatestSchemaVersion = 55;
+        private const int LatestSchemaVersion = 56;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.