diff --git a/src/NPC.hpp b/src/NPC.hpp
index 94e9a9b..3dffe27 100644
--- a/src/NPC.hpp
+++ b/src/NPC.hpp
@@ -22,8 +22,7 @@ public:
         appearanceData.iBarkerType = 0;
         appearanceData.iNPC_ID = id;
 
-        chunkPos = ChunkManager::grabChunk(x, y);
-        currentChunks = ChunkManager::grabChunks(chunkPos);
+        chunkPos = std::pair<int, int>(0, 0);
     };
     BaseNPC(int x, int y, int z, int type, int id, NPCClass classType) : BaseNPC(x, y, z, type, id) {
         npcClass = classType;
diff --git a/src/NPCManager.cpp b/src/NPCManager.cpp
index 4a58aff..4a4b3d4 100644
--- a/src/NPCManager.cpp
+++ b/src/NPCManager.cpp
@@ -530,7 +530,6 @@ void NPCManager::npcSummonHandler(CNSocket* sock, CNPacketData* data) {
         NPCs[resp.NPCAppearanceData.iNPC_ID] = new BaseNPC(plr->x, plr->y, plr->z, req->iNPCType, resp.NPCAppearanceData.iNPC_ID);
 
     updateNPCPosition(resp.NPCAppearanceData.iNPC_ID, plr->x, plr->y, plr->z);
-    ChunkManager::addNPC(plr->x, plr->y, resp.NPCAppearanceData.iNPC_ID);
 }
 
 void NPCManager::npcWarpHandler(CNSocket* sock, CNPacketData* data) {