diff --git a/Barotrauma/BarotraumaServer/ServerSource/Program.cs b/Barotrauma/BarotraumaServer/ServerSource/Program.cs
index dde9fa258..c5bd63303 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Program.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Program.cs
@@ -73,6 +73,11 @@ namespace Barotrauma
                 Directory.SetCurrentDirectory(executableDir);
             }
 
+            if (File.Exists("usecurrentdirectoryforsaves"))
+            {
+                SaveUtil.SaveFolder = Environment.CurrentDirectory;
+            }
+
             Game = new GameMain(args);
 
             Game.Run();