diff --git a/worker/workerState.go b/worker/workerState.go
index 96364d9..94ce147 100644
--- a/worker/workerState.go
+++ b/worker/workerState.go
@@ -16,6 +16,7 @@ type State struct {
 	Host           string
 	LastSeen       int64
 	requestCounter *RequestCounter
+	mu             sync.Mutex
 }
 
 var requestLimits map[int]int
@@ -33,6 +34,7 @@ func GetWorkerState(workerId string) *State {
 	if s, found := states[workerId]; !found {
 		newState := &State{
 			Uuid:           workerId,
+			LastSeen:       time.Now().Unix(),
 			requestCounter: NewRequestCounter(),
 		}
 		newState.SetRequestLimits(requestLimits)
@@ -99,11 +101,29 @@ func GetWorkers() (results []*State) {
 	return results
 }
 
+func SetRequestLimits(limits map[int]int) {
+	requestLimits = limits
+}
+
+// Lock locks the mutex for the State
+func (ws *State) Lock() {
+	ws.mu.Lock()
+}
+
+// Unlock unlocks the mutex for the State
+func (ws *State) Unlock() {
+	ws.mu.Unlock()
+}
+
 func (ws *State) ResetUsername() {
+	ws.Lock()
+	defer ws.Unlock()
 	ws.Username = ""
 }
 
 func (ws *State) ResetAreaAndRoutePart() {
+	ws.Lock()
+	defer ws.Unlock()
 	ws.AreaId = 0
 	ws.StartStep = 0
 	ws.EndStep = 0
@@ -111,36 +131,46 @@ func (ws *State) ResetAreaAndRoutePart() {
 }
 
 func (ws *State) Touch(host string) {
+	ws.Lock()
+	defer ws.Unlock()
 	ws.Host = host
 }
 
 func (ws *State) LastLocation(lat, lon float64, host string) {
+	ws.Lock()
+	defer ws.Unlock()
 	ws.Host = host
 	ws.LastSeen = time.Now().Unix()
 }
 
-func SetRequestLimits(limits map[int]int) {
-	requestLimits = limits
-}
-
 func (ws *State) SetRequestLimits(limits map[int]int) {
+	ws.Lock()
+	defer ws.Unlock()
 	if len(limits) > 0 {
 		ws.requestCounter.SetLimits(limits)
 	}
 }
 
 func (ws *State) IncrementLimit(method int) {
+	ws.Lock()
+	defer ws.Unlock()
 	ws.requestCounter.Increment(method)
 }
 
 func (ws *State) CheckLimitExceeded() bool {
+	ws.Lock()
+	defer ws.Unlock()
 	return ws.requestCounter.CheckLimitsExceeded()
 }
 
 func (ws *State) RequestCounts() map[int]int {
+	ws.Lock()
+	defer ws.Unlock()
 	return ws.requestCounter.RequestCounts()
 }
 
 func (ws *State) ResetCounter() {
+	ws.Lock()
+	defer ws.Unlock()
 	ws.requestCounter.ResetCounts()
 }
diff --git a/worker/workerarea.go b/worker/workerarea.go
index 0b97c0e..0bfe805 100644
--- a/worker/workerarea.go
+++ b/worker/workerarea.go
@@ -196,12 +196,10 @@ func (p *WorkerArea) RecalculateRouteParts() {
 	var activeWorkers []*State
 	now := time.Now().Unix()
 	for _, ws := range workersInArea {
-		if ws.LastSeen == 0 || now-ws.LastSeen <= workerUnseen {
+		if now-ws.LastSeen <= workerUnseen {
 			activeWorkers = append(activeWorkers, ws)
 		} else {
-			ws.Step = 0
-			ws.StartStep = 0
-			ws.EndStep = 0
+			ws.ResetAreaAndRoutePart()
 		}
 	}