diff --git a/api/server/server.go b/api/server/server.go
index eef77cc5d5..87b40d21c8 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -32,7 +32,7 @@ import (
 )
 
 var (
-	activationLock chan struct{} = make(chan struct{})
+	activationLock = make(chan struct{})
 )
 
 type HttpServer struct {
diff --git a/api/server/server_windows.go b/api/server/server_windows.go
index e7feb55a21..ad7b3c48ad 100644
--- a/api/server/server_windows.go
+++ b/api/server/server_windows.go
@@ -39,10 +39,12 @@ func NewServer(proto, addr string, job *engine.Job) (Server, error) {
 }
 
 // Called through eng.Job("acceptconnections")
-func AcceptConnections(job *engine.Job) engine.Status {
+func AcceptConnections(job *engine.Job) error {
 	// close the lock so the listeners start accepting connections
-	if activationLock != nil {
+	select {
+	case <-activationLock:
+	default:
 		close(activationLock)
 	}
-	return engine.StatusOK
+	return nil
 }