diff --git a/packages/entity/traits/spawner.trait.js b/packages/entity/traits/spawner.trait.js
index e080b63..5d3dd9d 100644
--- a/packages/entity/traits/spawner.trait.js
+++ b/packages/entity/traits/spawner.trait.js
@@ -20,6 +20,7 @@ export default class Spawner extends decorate(Trait) {
         label: 'Kill all spawned children',
       },
       spawn: {
+        cycle: true,
         type: 'entity',
         label: 'Spawn $1 with $2 extensions.',
         args: [
@@ -32,6 +33,7 @@ export default class Spawner extends decorate(Trait) {
         ],
       },
       spawnAt: {
+        cycle: true,
         type: 'entity',
         label: 'Spawn $1 as $2 with $3 extensions.',
         args: [
@@ -47,6 +49,7 @@ export default class Spawner extends decorate(Trait) {
         ],
       },
       spawnRaw: {
+        cycle: true,
         type: 'entity',
         label: 'Spawn $1.',
         args: [
@@ -56,6 +59,7 @@ export default class Spawner extends decorate(Trait) {
         ]
       },
       spawnRawAt: {
+        cycle: true,
         type: 'entity',
         label: 'Spawn $1 at $2.',
         args: [
diff --git a/packages/physics/traits/emitter.trait.js b/packages/physics/traits/emitter.trait.js
index 49b17a2..1bcd729 100644
--- a/packages/physics/traits/emitter.trait.js
+++ b/packages/physics/traits/emitter.trait.js
@@ -17,6 +17,7 @@ export default class Emitter extends decorate(Trait) {
   static behaviorContextTypes() {
     return {
       emitParticleEntity: {
+        cycle: true,
         type: 'entity',
         label: 'Create particle.',
         args: [