diff --git a/packages/edge/api/actor/src/route/actors/mod.rs b/packages/edge/api/actor/src/route/actors/mod.rs
index 17b0d0bf26..e5d6d2fd41 100644
--- a/packages/edge/api/actor/src/route/actors/mod.rs
+++ b/packages/edge/api/actor/src/route/actors/mod.rs
@@ -153,7 +153,7 @@ pub async fn create(
 		resources: None,
 		lifecycle: body.lifecycle.map(|x| (*x).api_into()).unwrap_or_else(|| {
 			pegboard::types::ActorLifecycle {
-				kill_timeout_ms: 0,
+				kill_timeout_ms: 5000,
 				durable: false,
 			}
 		}),
diff --git a/packages/edge/api/actor/src/route/containers.rs b/packages/edge/api/actor/src/route/containers.rs
index 6fdd7f35ae..818af5fd78 100644
--- a/packages/edge/api/actor/src/route/containers.rs
+++ b/packages/edge/api/actor/src/route/containers.rs
@@ -154,7 +154,7 @@ pub async fn create(
 		resources: Some((*body.resources).api_into()),
 		lifecycle: body.lifecycle.map(|x| (*x).api_into()).unwrap_or_else(|| {
 			pegboard::types::ActorLifecycle {
-				kill_timeout_ms: 0,
+				kill_timeout_ms: 5000,
 				durable: false,
 			}
 		}),