diff --git a/TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs b/TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs
index b147f35a..d3cb794c 100644
--- a/TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs
+++ b/TerrariaServerAPI/TerrariaApi.Server/ServerApi.cs
@@ -202,7 +202,15 @@ internal static void HandleCommandLine(string[] parms)
 						}
 					case "-world":
 						{
-							game.SetWorld(arg.Value, false);
+							if (File.Exists(arg.Value))
+							{
+								game.SetWorld(arg.Value, false);
+							}
+							else
+							{
+								Main.autoGenFileLocation = arg.Value;
+								Main.ActiveWorldFileData = new Terraria.IO.WorldFileData(arg.Value, false);
+							}
 
 							var full_path = Path.GetFullPath(arg.Value);
 							Main.WorldPath = Path.GetDirectoryName(full_path);