diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 6f26279e..fe8a9394 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -2706,7 +2706,9 @@ namespace TShockAPI
 
             if ((TShock.Config.ServerSideCharacter) && (args.Player.sX > 0) && (args.Player.sY > 0))
             {
-				args.Player.Teleport(args.Player.sX * 16, (args.Player.sY * 16) -48);
+				if (WorldGen.StartRoomCheck(args.Player.sX, args.Player.sY -1))
+					args.Player.Teleport(args.Player.sX * 16, (args.Player.sY * 16) -48);
+
             }
 			
 			args.Player.Dead = false;