diff --git a/Projects/Server/Interfaces.cs b/Projects/Server/Interfaces.cs
index ffdb6bf33..a75437b37 100644
--- a/Projects/Server/Interfaces.cs
+++ b/Projects/Server/Interfaces.cs
@@ -61,6 +61,7 @@ public interface ISpawner : IEntity
     int HomeRange { get; }
     Region Region { get; }
     bool ReturnOnDeactivate { get; }
+    bool Running { get; }
 
     void Remove(ISpawnable spawn);
     Point3D GetSpawnPosition(ISpawnable spawned, Map map);
diff --git a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs
index d44527c6e..95589ab6a 100644
--- a/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs	
+++ b/Projects/UOContent/Engines/Advanced Search/AdvancedSearchGump.cs	
@@ -575,9 +575,9 @@ public class AdvancedSearchGump : Gump
                         {
                             var entry = SearchResults[i];
 
-                            if (entry.Selected)
+                            if (entry.Selected && entry.Entity is ISpawner { Running: true } spawner)
                             {
-                                (entry.Entity as Spawner)?.Respawn();
+                                spawner.Respawn();
                             }
                         }
                     }
diff --git a/Projects/UOContent/Engines/Spawners/Commands/RespawnCommand.cs b/Projects/UOContent/Engines/Spawners/Commands/RespawnCommand.cs
index bfb4c6f2b..97c00fc81 100644
--- a/Projects/UOContent/Engines/Spawners/Commands/RespawnCommand.cs
+++ b/Projects/UOContent/Engines/Spawners/Commands/RespawnCommand.cs
@@ -51,7 +51,7 @@ public class RespawnCommand : BaseCommand
 
         foreach (var obj in list)
         {
-            if (obj is ISpawner spawner)
+            if (obj is ISpawner { Running: true } spawner)
             {
                 spawner.Respawn();
             }
diff --git a/Projects/UOContent/Engines/Spawners/ProximitySpawner.cs b/Projects/UOContent/Engines/Spawners/ProximitySpawner.cs
index 052a5e5bd..ad1dde122 100644
--- a/Projects/UOContent/Engines/Spawners/ProximitySpawner.cs
+++ b/Projects/UOContent/Engines/Spawners/ProximitySpawner.cs
@@ -95,7 +95,7 @@ public partial class ProximitySpawner : Spawner
 
     public override string DefaultName => "Proximity Spawner";
 
-    public override bool HandlesOnMovement => true;
+    public override bool HandlesOnMovement => Running;
 
     public override void ToJson(DynamicJson json, JsonSerializerOptions options)
     {