diff --git a/main/src/main/java/net/citizensnpcs/Settings.java b/main/src/main/java/net/citizensnpcs/Settings.java
index 2d986e4f6..bffe54ee9 100644
--- a/main/src/main/java/net/citizensnpcs/Settings.java
+++ b/main/src/main/java/net/citizensnpcs/Settings.java
@@ -110,6 +110,7 @@ public class Settings {
         DISABLE_LOOKCLOSE_WHILE_NAVIGATING("npc.default.look-close.disable-while-navigating", true),
         DISABLE_MC_NAVIGATION_FALLBACK("npc.pathfinding.disable-mc-fallback-navigation", true),
         DISABLE_TABLIST("npc.tablist.disable", true),
+        ENTITY_SPAWN_WAIT_TICKS("general.entity-spawn-wait-ticks", 10),
         ERROR_COLOUR("general.color-scheme.message-error", "<c>"),
         FOLLOW_ACROSS_WORLDS("npc.follow.teleport-across-worlds", true),
         HIGHLIGHT_COLOUR("general.color-scheme.message-highlight", "<e>"),
diff --git a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 4ef1434c3..60719226a 100644
--- a/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -298,7 +298,7 @@ public class CitizensNPC extends AbstractNPC {
 
             @Override
             public void run() {
-                if (timer++ > 10) {
+                if (timer++ > Setting.ENTITY_SPAWN_WAIT_TICKS.asInt()) {
                     Messaging.debug("Couldn't spawn", CitizensNPC.this, "entity not added to world");
                     entityController.remove();
                     cancel();