diff --git a/src/LibVLCSharp/Shared/MediaPlayer.cs b/src/LibVLCSharp/Shared/MediaPlayer.cs
index 1f8f720d465ec9b73b042185f7efcbbb7074b2a2..f741c4951ede6760d9d970201e910a1a2cd2b37f 100644
--- a/src/LibVLCSharp/Shared/MediaPlayer.cs
+++ b/src/LibVLCSharp/Shared/MediaPlayer.cs
@@ -2405,11 +2405,10 @@ namespace LibVLCSharp.Shared
             if(disposing)
             {
                 if(IsPlaying)
-                {
                     Stop();
-                }
 
-                Media?.Dispose();
+                if (_gcHandle.IsAllocated)
+                    _gcHandle.Free();
             }
 
             base.Dispose(disposing);