diff --git a/Server/src/main/core/game/node/entity/npc/NPC.java b/Server/src/main/core/game/node/entity/npc/NPC.java
index 8d8ccf59b..31771fa1e 100644
--- a/Server/src/main/core/game/node/entity/npc/NPC.java
+++ b/Server/src/main/core/game/node/entity/npc/NPC.java
@@ -447,10 +447,14 @@ public class NPC extends Entity {
 				if (
 						!pathBoundMovement
 						&& walkRadius > 0
+						&& walkRadius <= 20
 						&& !getLocation().withinDistance(getProperties().getSpawnLocation(), (int)(walkRadius * 1.5))
 						&& !getAttribute("no-spawn-return", false)
 					)	
 				{
+					MovementPulse current = getAttribute("return-to-spawn-pulse");
+					if (current != null && current.isRunning()) return;
+
 					if(!isNeverWalks()){
 						if(walkRadius == 0)
 							walkRadius = 3;
diff --git a/Server/src/test/kotlin/APITests.kt b/Server/src/test/kotlin/APITests.kt
index 6080c7f77..0047a74f4 100644
--- a/Server/src/test/kotlin/APITests.kt
+++ b/Server/src/test/kotlin/APITests.kt
@@ -9,8 +9,14 @@ import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
 class APITests {
-    val testPlayer = TestUtils.getMockPlayer("test")
-    val testPlayer2 = TestUtils.getMockPlayer("test2")
+    var testPlayer: MockPlayer
+    var testPlayer2: MockPlayer
+
+    init {
+        TestUtils.preTestSetup()
+        testPlayer = TestUtils.getMockPlayer("test")
+        testPlayer2 = TestUtils.getMockPlayer("test2")
+    }
 
     @Test fun testIfaceSettings(){
         var builder = IfaceSettingsBuilder()