diff --git a/client/internal/engine.go b/client/internal/engine.go
index f25801fb6..1f9f67a62 100644
--- a/client/internal/engine.go
+++ b/client/internal/engine.go
@@ -946,7 +946,7 @@ func (e *Engine) receiveJobEvents() {
 }
 
 func (e *Engine) handleBundle(params *mgmProto.BundleParameters) (string, error) {
-	// todo: implement with real deamon address
+	// todo: implement with real daemon address
 	conn, err := e.getPeerClient("unix:///var/run/netbird.sock")
 	if err != nil {
 		return "", err
@@ -981,7 +981,7 @@ func (e *Engine) handleBundle(params *mgmProto.BundleParameters) (string, error)
 }
 
 func (e *Engine) getStatusOutput(anon bool) (string, error) {
-	// todo: implement with real deamon address
+	// todo: implement with real daemon address
 	conn, err := e.getPeerClient("unix:///var/run/netbird.sock")
 	if err != nil {
 		return "", err
diff --git a/management/server/types/job.go b/management/server/types/job.go
index 35e761c5f..74abba9be 100644
--- a/management/server/types/job.go
+++ b/management/server/types/job.go
@@ -136,8 +136,8 @@ func validateAndBuildBundleParams(req api.WorkloadRequest, workload *Workload) e
 	if err != nil {
 		return fmt.Errorf("invalid parameters for bundle job")
 	}
-	// validate bundle_for_time <= 5 minutes
-	if bundle.Parameters.BundleForTime < 1 || bundle.Parameters.BundleForTime > 5 {
+	// validate bundle_for_time <= 5 minutes if BundleFor is enabled
+	if bundle.Parameters.BundleFor && bundle.Parameters.BundleForTime < 1 || bundle.Parameters.BundleForTime > 5 {
 		return fmt.Errorf("bundle_for_time must be between 1 and 5, got %d", bundle.Parameters.BundleForTime)
 	}
 	// validate log-file-count ≥ 1 and ≤ 1000