diff --git a/src/MobManager.js b/src/MobManager.js
index 2420f13b..999295a6 100644
--- a/src/MobManager.js
+++ b/src/MobManager.js
@@ -21,10 +21,14 @@ class MobManager {
    */
   removeMob(mob) {
     mob.effects.clear();
+    const sourceRoom = mob.sourceRoom;
+    if (sourceRoom) {
+      sourceRoom.area.removeNpc(mob);
+      sourceRoom.removeNpc(mob, true);
+    }
     const room = mob.room;
-    if (room) {
-      room.area.removeNpc(mob);
-      room.removeNpc(mob, true);
+    if (room && room !== sourceRoom) {
+      room.removeNpc(mob);
     }
     mob.__pruned = true;
     mob.removeAllListeners();