diff --git a/daemon/cluster/cluster.go b/daemon/cluster/cluster.go
index a83c2e5d14..9c3fa08da3 100644
--- a/daemon/cluster/cluster.go
+++ b/daemon/cluster/cluster.go
@@ -998,13 +998,13 @@ func (c *Cluster) managerStats() (current bool, reachable int, unreachable int,
 	}
 	for _, n := range nodes.Nodes {
 		if n.ManagerStatus != nil {
-			if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
+			if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
 				reachable++
 				if n.ID == c.node.NodeID() {
 					current = true
 				}
 			}
-			if n.ManagerStatus.Raft.Status.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
+			if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
 				unreachable++
 			}
 		}
diff --git a/daemon/cluster/convert/node.go b/daemon/cluster/convert/node.go
index fb15b2b5fa..04c40ff112 100644
--- a/daemon/cluster/convert/node.go
+++ b/daemon/cluster/convert/node.go
@@ -56,9 +56,9 @@ func NodeFromGRPC(n swarmapi.Node) types.Node {
 	//Manager
 	if n.ManagerStatus != nil {
 		node.ManagerStatus = &types.ManagerStatus{
-			Leader:       n.ManagerStatus.Raft.Status.Leader,
-			Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Raft.Status.Reachability.String())),
-			Addr:         n.ManagerStatus.Raft.Addr,
+			Leader:       n.ManagerStatus.Leader,
+			Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Reachability.String())),
+			Addr:         n.ManagerStatus.Addr,
 		}
 	}