diff --git a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
index 65a82b2..405388f 100644
--- a/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/management/ServerConfigurationManager.java
@@ -528,6 +528,7 @@
 		WorldServer worldserver = this.mcServer.worldServerForDimension(p_72356_1_.dimension);
 		p_72356_1_.dimension = p_72356_2_;
 		WorldServer worldserver1 = this.mcServer.worldServerForDimension(p_72356_1_.dimension);
+		p_72356_1_.getChunkMgr().stopSending(); //before sending S07PacketRespawn
 		p_72356_1_.playerNetServerHandler.sendPacket(new S07PacketRespawn(p_72356_1_.dimension, p_72356_1_.worldObj.difficultySetting, p_72356_1_.worldObj.getWorldInfo().getTerrainType(), p_72356_1_.theItemInWorldManager.getGameType()));
 		worldserver.removePlayerEntityDangerously(p_72356_1_);
 		p_72356_1_.isDead = false;
diff --git a/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java b/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java
index ba4c23d..8c229b8 100644
--- a/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java
+++ b/src/main/java/org/ultramine/server/chunk/ChunkSendManager.java
@@ -27,7 +27,6 @@
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.chunk.Chunk;
-import net.minecraft.world.gen.ChunkProviderServer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.ChunkWatchEvent;
 
@@ -171,6 +170,11 @@
 		this.manager = null;
 	}
 	
+	public void stopSending()
+	{
+		removeFrom(manager);
+	}
+	
 	public void update()
 	{
 		if(!toSend.isEmpty())