diff --git a/AdaptixServer/core/server/mgr_task.go b/AdaptixServer/core/server/mgr_task.go
index c7f59d49..ed25e3e0 100644
--- a/AdaptixServer/core/server/mgr_task.go
+++ b/AdaptixServer/core/server/mgr_task.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Adaptix-Framework/axc2"
+	adaptix "github.com/Adaptix-Framework/axc2"
 )
 
 type TaskHandler interface {
@@ -141,7 +141,7 @@ func (tm *TaskManager) Create(agentId string, cmdline string, client string, tas
 		return
 	}
 
-	if !agent.Active {
+	if !agent.IsActive() {
 		return
 	}
 
diff --git a/AdaptixServer/core/server/server.go b/AdaptixServer/core/server/server.go
index 93d3505a..76f442b2 100644
--- a/AdaptixServer/core/server/server.go
+++ b/AdaptixServer/core/server/server.go
@@ -14,7 +14,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/Adaptix-Framework/axc2"
+	adaptix "github.com/Adaptix-Framework/axc2"
 	"github.com/goccy/go-yaml"
 )
 
@@ -111,12 +111,12 @@ func (ts *Teamserver) RestoreData() {
 			RunningJobs:       safe.NewMap(),
 			PivotParent:       nil,
 			PivotChilds:       safe.NewSlice(),
-			Tick:              false,
-			Active:            true,
 		}
 
 		if agentData.Mark == "Terminated" {
-			agent.Active = false
+			agent.SetActive(false)
+		} else {
+			agent.SetActive(true)
 		}
 
 		if agentData.Mark == "" {
diff --git a/AdaptixServer/core/server/ts_agent.go b/AdaptixServer/core/server/ts_agent.go
index 25620fba..011422b4 100644
--- a/AdaptixServer/core/server/ts_agent.go
+++ b/AdaptixServer/core/server/ts_agent.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Adaptix-Framework/axc2"
+	adaptix "github.com/Adaptix-Framework/axc2"
 )
 
 func (ts *Teamserver) TsAgentList() (string, error) {
@@ -89,9 +89,8 @@ func (ts *Teamserver) TsAgentCreate(agentCrc string, agentId string, beat []byte
 		RunningJobs:       safe.NewMap(),
 		PivotParent:       nil,
 		PivotChilds:       safe.NewSlice(),
-		Tick:              false,
-		Active:            true,
 	}
+	agent.SetActive(true)
 	agent.SetData(agentData)
 
 	// --- PRE HOOK ---
@@ -137,7 +136,7 @@ func (ts *Teamserver) TsAgentCommand(agentName string, agentId string, clientNam
 	if err != nil {
 		return err
 	}
-	if !agent.Active {
+	if !agent.IsActive() {
 		return fmt.Errorf("agent '%v' not active", agentId)
 	}
 
@@ -615,7 +614,7 @@ func (ts *Teamserver) TsAgentTerminate(agentId string, terminateTaskId string) e
 	if !ok {
 		return errors.New("invalid agent type")
 	}
-	agent.Active = false
+	agent.SetActive(false)
 	agent.UpdateData(func(d *adaptix.AgentData) {
 		d.Mark = "Terminated"
 	})
@@ -854,7 +853,7 @@ func (ts *Teamserver) TsAgentSetTick(agentId string, listenerName string) error
 			})
 			_ = ts.DBMS.DbAgentTick(agent.GetData())
 		}
-		agent.Tick = true
+		agent.SetTicked(true)
 	} else if listenerChanged {
 		agent.UpdateData(func(d *adaptix.AgentData) {
 			d.Listener = listenerName
@@ -879,8 +878,8 @@ func (ts *Teamserver) TsAgentTickUpdate() {
 			}
 			agentData := agent.GetData()
 			if agentData.Async {
-				if agent.Tick {
-					agent.Tick = false
+				if agent.IsTicked() {
+					agent.SetTicked(false)
 					agentSlice = append(agentSlice, agentData.Id)
 				}
 			}
diff --git a/AdaptixServer/core/server/ts_terminal.go b/AdaptixServer/core/server/ts_terminal.go
index 3aaa45ba..12579337 100644
--- a/AdaptixServer/core/server/ts_terminal.go
+++ b/AdaptixServer/core/server/ts_terminal.go
@@ -41,7 +41,7 @@ func (ts *Teamserver) TsAgentTerminalCreateChannel(terminalData string, wsconn *
 	if err != nil {
 		return err
 	}
-	if !agent.Active {
+	if !agent.IsActive() {
 		return fmt.Errorf("agent '%v' not active", td.AgentId)
 	}
 
diff --git a/AdaptixServer/core/server/ts_tunnels.go b/AdaptixServer/core/server/ts_tunnels.go
index 1652396d..f4d91aeb 100644
--- a/AdaptixServer/core/server/ts_tunnels.go
+++ b/AdaptixServer/core/server/ts_tunnels.go
@@ -17,7 +17,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Adaptix-Framework/axc2"
+	adaptix "github.com/Adaptix-Framework/axc2"
 	"github.com/gorilla/websocket"
 )
 
@@ -45,7 +45,7 @@ func (ts *Teamserver) TsTunnelClientStart(AgentId string, Listen bool, Type int,
 	if !ok {
 		return "", fmt.Errorf("invalid agent type for '%v'", AgentId)
 	}
-	if agent.Active == false {
+	if !agent.IsActive() {
 		return "", fmt.Errorf("agent '%v' not active", AgentId)
 	}
 
diff --git a/AdaptixServer/core/server/utils.go b/AdaptixServer/core/server/utils.go
index 765a841d..08469efd 100644
--- a/AdaptixServer/core/server/utils.go
+++ b/AdaptixServer/core/server/utils.go
@@ -14,7 +14,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/Adaptix-Framework/axc2"
+	adaptix "github.com/Adaptix-Framework/axc2"
 	"github.com/gorilla/websocket"
 )
 
@@ -68,8 +68,8 @@ type Agent struct {
 	mu       sync.RWMutex
 	data     adaptix.AgentData
 	Extender adaptix.ExtenderAgent
-	Tick     bool
-	Active   bool
+	tick     atomic.Bool
+	active   atomic.Bool
 
 	HostedTasks       *safe.Queue // taskData TaskData
 	HostedTunnelTasks *safe.Queue // taskData TaskData
@@ -82,6 +82,22 @@ type Agent struct {
 	PivotChilds *safe.Slice
 }
 
+func (a *Agent) IsTicked() bool {
+	return a.tick.Load()
+}
+
+func (a *Agent) SetTicked(v bool) {
+	a.tick.Store(v)
+}
+
+func (a *Agent) IsActive() bool {
+	return a.active.Load()
+}
+
+func (a *Agent) SetActive(v bool) {
+	a.active.Store(v)
+}
+
 func (a *Agent) GetData() adaptix.AgentData {
 	a.mu.RLock()
 	defer a.mu.RUnlock()