diff --git a/Directory.build.props b/Directory.build.props
index 4fad10b9..aedf5d15 100644
--- a/Directory.build.props
+++ b/Directory.build.props
@@ -14,7 +14,7 @@
     <RepositoryType>git</RepositoryType>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <NeutralLanguage>en</NeutralLanguage>
-    <Version>0.8.3</Version>
+    <Version>0.8.4</Version>
 
     <LangVersion>latest</LangVersion>
     <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
diff --git a/MediaManager/Platforms/Android/Media/MediaItemExtensions.cs b/MediaManager/Platforms/Android/Media/MediaItemExtensions.cs
index 15cd2ee9..82e93813 100644
--- a/MediaManager/Platforms/Android/Media/MediaItemExtensions.cs
+++ b/MediaManager/Platforms/Android/Media/MediaItemExtensions.cs
@@ -32,6 +32,8 @@ public static IMediaSource ToMediaSource(this MediaDescriptionCompat mediaDescri
             switch (mediaType)
             {
                 default:
+                case MediaType.Audio:
+                case MediaType.Video:
                 case MediaType.Default:
                     mediaSource = new ExtractorMediaSource.Factory(MediaManager.AndroidMediaPlayer.DataSourceFactory)
                         .SetTag(mediaDescription)
diff --git a/MediaManager/Platforms/Android/Queue/QueueMediaSourceFactory.cs b/MediaManager/Platforms/Android/Queue/QueueMediaSourceFactory.cs
index a08e59c0..dd788f07 100644
--- a/MediaManager/Platforms/Android/Queue/QueueMediaSourceFactory.cs
+++ b/MediaManager/Platforms/Android/Queue/QueueMediaSourceFactory.cs
@@ -3,12 +3,15 @@
 using Android.Support.V4.Media;
 using Com.Google.Android.Exoplayer2.Ext.Mediasession;
 using Com.Google.Android.Exoplayer2.Source;
+using MediaManager.Media;
 using MediaManager.Platforms.Android.Media;
 
 namespace MediaManager.Platforms.Android.Queue
 {
     public class QueueMediaSourceFactory : Java.Lang.Object, TimelineQueueEditor.IMediaSourceFactory
     {
+        protected MediaManagerImplementation MediaManager => CrossMediaManager.Android;
+
         public QueueMediaSourceFactory()
         {
         }
@@ -20,7 +23,9 @@ protected QueueMediaSourceFactory(IntPtr handle, JniHandleOwnership transfer) :
         public IMediaSource CreateMediaSource(MediaDescriptionCompat description)
         {
             //TODO: We should be able to know the type here
-            return description?.ToMediaSource(MediaManager.Media.MediaType.Default);
+            //MediaManager.MediaExtractor.GetMediaType()
+
+            return description?.ToMediaSource(MediaType.Default);
         }
     }
 }