diff --git a/src/main/java/noppes/npcs/VersionCompatibility.java b/src/main/java/noppes/npcs/VersionCompatibility.java
index 98dd6c20e..aa521ea4d 100644
--- a/src/main/java/noppes/npcs/VersionCompatibility.java
+++ b/src/main/java/noppes/npcs/VersionCompatibility.java
@@ -110,6 +110,10 @@ public static void CheckNpcCompatibility(EntityNPCInterface npc, NBTTagCompound
 
                 compound.setIntArray("StartPosNew", new int[]{x, y, z});
             }
+
+            if (compound.hasKey("SpawnerDoesntDie") && !compound.hasKey("DespawnOnTargetLost")) {
+                compound.setBoolean("DespawnOnTargetLost", true);
+            }
         }
         if (npc.npcVersion == 13) {
             boolean bo = compound.getBoolean("HealthRegen");
diff --git a/src/main/java/noppes/npcs/roles/JobSpawner.java b/src/main/java/noppes/npcs/roles/JobSpawner.java
index 11e71bc20..3b7960417 100644
--- a/src/main/java/noppes/npcs/roles/JobSpawner.java
+++ b/src/main/java/noppes/npcs/roles/JobSpawner.java
@@ -145,6 +145,10 @@ public void setJobCompound(int i, NBTTagCompound compound) {
 
     @Override
     public void aiUpdateTask() {
+        if (spawned.isEmpty()) {
+            spawned = getNearbySpawned();
+        }
+
         if (spawned.isEmpty()) {
             if (spawnType == 0) {
                 if (spawnEntity(number + 1) == null && !doesntDie)