diff --git a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
index 69eae5636..d3495a4c9 100644
--- a/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
+++ b/Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
@@ -113,7 +113,14 @@ namespace Barotrauma
 			lua.Globals["Random"] = new LuaRandom();
 			lua.Globals["Timer"] = new LuaTimer(this);
 
-			luaScriptLoader.RunFolder("Lua/autorun");
+			foreach (string d in Directory.GetDirectories("Lua"))
+			{
+				if (Directory.Exists(d + "/autorun"))
+				{
+					luaScriptLoader.RunFolder(d + "/autorun");
+				}
+			}
+
 
 
 		}