diff --git a/core/site_optimizer.go b/core/site_optimizer.go
index 2e573ec12..bd1861aad 100644
--- a/core/site_optimizer.go
+++ b/core/site_optimizer.go
@@ -54,6 +54,10 @@ type responseDetails struct {
 func (site *Site) optimizerUpdateAsync(battery []measurement) {
 	var err error
 
+	if time.Since(updated) < 2*time.Minute {
+		return
+	}
+
 	if !mu.CompareAndSwap(0, 1) {
 		return
 	}
@@ -71,10 +75,6 @@ func (site *Site) optimizerUpdateAsync(battery []measurement) {
 		}
 	}()
 
-	if time.Since(updated) < 2*time.Minute {
-		return
-	}
-
 	err = site.optimizerUpdate(battery)
 }