diff --git a/agent/agent.go b/agent/agent.go
index b333147db..97f264aad 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -549,8 +549,8 @@ func (a *Agent) HbStatus() {
 		} else {
 			hb.Hidden = inf.Hidden
 			hb.Passive = inf.Passive
+			hb.Arbiter = inf.ArbiterOnly
 		}
-		hb.Arbiter = inf.ArbiterOnly
 
 		err = a.pbm.SetAgentStatus(hb)
 		if err != nil {