1 files changed, 4 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
index b4c6ae724..775f7224c 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
@@ -257,10 +257,10 @@ namespace MediaBrowser.Server.Implementations.Channels
             {
                 results = video.ChannelMediaSources;
             }
-            var audio = item as ChannelAudioItem;
+            var audio = item as Audio;
             if (audio != null)
             {
-                results = audio.ChannelMediaSources;
+                results = audio.ChannelMediaSources ?? new List<ChannelMediaInfo>();
             }
 
             var sources = SortMediaInfoResults(results)
@@ -1259,7 +1259,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
             else if (info.MediaType == ChannelMediaType.Audio)
             {
-                item = GetItemById<ChannelAudioItem>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
+                item = GetItemById<Audio>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
             }
             else
             {
@@ -1299,10 +1299,9 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
             item.ExternalId = info.Id;
 
-            var channelAudioItem = item as ChannelAudioItem;
+            var channelAudioItem = item as Audio;
             if (channelAudioItem != null)
             {
-                channelAudioItem.ContentType = info.ContentType;
                 channelAudioItem.ExtraType = info.ExtraType;
                 channelAudioItem.ChannelMediaSources = info.MediaSources;