1 files changed, 4 insertions, 1 deletions
diff --git a/Ryujinx.HLE/FileSystem/SaveHelper.cs b/Ryujinx.HLE/FileSystem/SaveHelper.cs
index 67f01016..087156d2 100644
--- a/Ryujinx.HLE/FileSystem/SaveHelper.cs
+++ b/Ryujinx.HLE/FileSystem/SaveHelper.cs
@@ -1,5 +1,6 @@
 using Ryujinx.HLE.HOS;
 using System.IO;
+using System.Linq;
 
 using static Ryujinx.HLE.FileSystem.VirtualFileSystem;
 
@@ -35,9 +36,11 @@ namespace Ryujinx.HLE.FileSystem
                 }
             }
 
+            string SaveAccount = SaveMetaData.UserId.IsZero() ? "savecommon" : SaveMetaData.UserId.ToString();
+
             string SavePath = Path.Combine(BaseSavePath,
                 SaveMetaData.SaveId.ToString("x16"),
-                SaveMetaData.UserId.ToString(),
+                SaveAccount,
                 SaveMetaData.SaveDataType == SaveDataType.SaveData ? CurrentTitleId.ToString("x16") : string.Empty);
 
             return SavePath;