diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs
index 5e4d4da..3030bee 100644
--- a/Controllers/Managers/SongManager.cs
+++ b/Controllers/Managers/SongManager.cs
@@ -210,8 +210,10 @@ public class SongManager : BaseManager
     // Change the name of this method to only focus on wav files
     public void SaveSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
     {
-        song.SongDirectory = _tempDirectoryRoot;
-        song.DateCreated = DateTime.Now;
+        if (string.IsNullOrEmpty(song.SongDirectory))
+        {
+            song.SongDirectory = _tempDirectoryRoot;
+        }
 
         if (string.IsNullOrEmpty(song.Filename))
         {
diff --git a/Controllers/v1/SongDataController.cs b/Controllers/v1/SongDataController.cs
index c27ccd3..acfef4a 100644
--- a/Controllers/v1/SongDataController.cs
+++ b/Controllers/v1/SongDataController.cs
@@ -133,6 +133,7 @@ public class SongDataController : BaseController
                 var fileType = meta.FileExtensionType(tmpSong.SongPath());
                 song.Filename = tmpSong.Filename;
                 song.SongDirectory = tmpSong.SongDirectory;
+                song.DateCreated = tmpSong.DateCreated;
 
                 switch (fileType)
                 {