diff --git a/src/main/java/com/github/manolo8/darkbot/Main.java b/src/main/java/com/github/manolo8/darkbot/Main.java
index 2a541f455..7eb28a4be 100644
--- a/src/main/java/com/github/manolo8/darkbot/Main.java
+++ b/src/main/java/com/github/manolo8/darkbot/Main.java
@@ -263,8 +263,8 @@ private boolean isInvalid() {
 
     private void validTick() {
         settingsManager.tick();
-        hero.tick();
         mapManager.tick();
+        hero.tick();
         facadeManager.tick();
         effectManager.tick();
         guiManager.tick();
diff --git a/src/main/java/com/github/manolo8/darkbot/config/ConfigEntity.java b/src/main/java/com/github/manolo8/darkbot/config/ConfigEntity.java
index 7011db470..4a5f26d1b 100644
--- a/src/main/java/com/github/manolo8/darkbot/config/ConfigEntity.java
+++ b/src/main/java/com/github/manolo8/darkbot/config/ConfigEntity.java
@@ -50,7 +50,7 @@ public NpcInfo getOrCreateNpcInfo(String name) {
 
             info.name = name;
             info.radius = 560;
-            info.mapList.add(mapId);
+            if (mapId > 0) info.mapList.add(mapId);
 
             if (!name.isEmpty()) {
                 npcs.put(name, info);
@@ -58,7 +58,7 @@ public NpcInfo getOrCreateNpcInfo(String name) {
                 npcInfos.setValue(npcs);
                 changed();
             }
-        } else if (info.mapList.add(mapId)) {
+        } else if (mapId > 0 && info.mapList.add(mapId)) {
             npcInfos.setValue(npcs);
             changed();
         }
diff --git a/src/main/java/com/github/manolo8/darkbot/core/manager/MapManager.java b/src/main/java/com/github/manolo8/darkbot/core/manager/MapManager.java
index 02d2fb14f..4bb3f3dad 100644
--- a/src/main/java/com/github/manolo8/darkbot/core/manager/MapManager.java
+++ b/src/main/java/com/github/manolo8/darkbot/core/manager/MapManager.java
@@ -145,8 +145,10 @@ private void update(long address) {
         int currMap = API.readInt(address + 84);
         boolean switched = currMap != id;
 
-        if (switched)
+        if (switched) {
+            entities.clear();
             switchMap(main.starManager.byId(currMap));
+        }
 
         entities.update(address);
     }