diff --git a/src/Libraries/Mtp/Mtp/MtpDevice.cs b/src/Libraries/Mtp/Mtp/MtpDevice.cs
index 60b2437..87d506a 100644
--- a/src/Libraries/Mtp/Mtp/MtpDevice.cs
+++ b/src/Libraries/Mtp/Mtp/MtpDevice.cs
@@ -136,8 +136,12 @@ namespace Mtp
 			{
 				if (f.FolderId == this.device.default_album_folder)
 					albumFolder = f;
-				else if (f.FolderId == device.default_music_folder)
+				else if (f.FolderId == device.default_music_folder) {
 					musicFolder = f;
+					// Fix for mtp devices which don't have an explicit playlist folder
+					if (device.default_playlist_folder == 0x00000000)
+						playlistFolder = f;
+				}
 				else if (f.FolderId == device.default_organizer_folder)
 					organizerFolder = f;
 				else if (f.FolderId == device.default_picture_folder)
