diff --git a/src/player_compchecks.c b/src/player_compchecks.c
index 723dcf52a0..ff9da7f004 100644
--- a/src/player_compchecks.c
+++ b/src/player_compchecks.c
@@ -217,7 +217,7 @@ int calculate_number_of_creatures_to_move(struct Dungeon *dungeon, int percent_t
         if (!creature_is_being_unconscious(thing) && !thing_is_picked_up(thing) && !creature_is_kept_in_custody_by_enemy(thing))
         {
             struct CreatureStats* crstat = creature_stats_get_from_thing(thing);
-            if ((cctrl->job_assigned == crstat->job_primary) || (cctrl->job_assigned == crstat->job_secondary))
+            if ((cctrl->job_assigned == crstat->job_primary) || (cctrl->job_assigned == crstat->job_secondary) || (cctrl->job_assigned == 0))
             {
                 creatures_doing_primary_or_secondary_job += 1;
             } else {