diff --git a/src/API/PlayerAPI.php b/src/API/PlayerAPI.php
index 010ddebc50..b82585dec3 100644
--- a/src/API/PlayerAPI.php
+++ b/src/API/PlayerAPI.php
@@ -157,7 +157,7 @@ class PlayerAPI{
 					}
 					$spawn = $lv->getSpawn();
 				}else{
-					$spawn = $this->server->api->level->getDefault()->getSpawn();
+					$spawn = $issuer->getSpawn();
 				}
 
 				$issuer->teleport($spawn);
diff --git a/src/Player.php b/src/Player.php
index 25c8633a05..ba29706706 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -94,6 +94,10 @@ class Player{
 		console("[DEBUG] New Session started with ".$ip.":".$port.". MTU ".$this->MTU.", Client ID ".$this->clientID, true, true, 2);
 	}
 	
+	public function getSpawn(){
+		return $this->spawnPosition;
+	}
+	
 	public function setSpawn(Vector3 $pos){
 		if(!($pos instanceof Level)){
 			$level = $this->level;