diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
index c16250c..53f603d 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
@@ -156,7 +156,7 @@ namespace Banshee.Dap.MassStorage
                 "INSERT INTO CorePlaylistEntries (PlaylistID, TrackID) VALUES (?, ?)");
             int [] psources = new int [] {DbId};
             foreach (string playlist_path in PlaylistFiles) {
-                IPlaylistFormat loaded_playlist = PlaylistFileUtil.Load (playlist_path, new Uri (BaseDirectory));
+                IPlaylistFormat loaded_playlist = PlaylistFileUtil.Load (playlist_path, new Uri (playlists_path));
                 if (loaded_playlist == null)
                     continue;
 
@@ -223,9 +223,9 @@ namespace Banshee.Dap.MassStorage
             get {
                 if (playlists_path == null) {
                     if (MediaCapabilities == null || MediaCapabilities.PlaylistPath == null) {
-                        playlists_path = WritePath;
+                        playlists_path = BaseDirectory;
                     } else {
-                        playlists_path = System.IO.Path.Combine (WritePath, MediaCapabilities.PlaylistPath);
+                        playlists_path = System.IO.Path.Combine (BaseDirectory, MediaCapabilities.PlaylistPath);
                         playlists_path = playlists_path.Replace ("%File", String.Empty);
                     }
 
@@ -314,7 +314,7 @@ namespace Banshee.Dap.MassStorage
                         PlaylistsPath, String.Format ("{0}.{1}", from.Name, PlaylistTypes[0].FileExtension)));
 
                     System.IO.Stream stream = Banshee.IO.File.OpenWrite (playlist_path, true);
-                    playlist_format.BaseUri = new Uri (BaseDirectory);
+                    playlist_format.BaseUri = new Uri (playlists_path);
                     playlist_format.Save (stream, from);
                     stream.Close ();
                 }
