diff --git a/weed/server/master_server.go b/weed/server/master_server.go
index e3b5deea6..fa45053dd 100644
--- a/weed/server/master_server.go
+++ b/weed/server/master_server.go
@@ -191,7 +191,6 @@ func (ms *MasterServer) SetRaftServer(raftServer *RaftServer) {
 	} else if raftServer.RaftHashicorp != nil {
 		ms.Topo.HashicorpRaft = raftServer.RaftHashicorp
 		raftServerName = ms.Topo.HashicorpRaft.String()
-		// TODO fix this for hashicorp raft
 		ms.Topo.LastLeaderChangeTime = time.Now()
 	}
 	ms.Topo.RaftServerAccessLock.Unlock()
diff --git a/weed/server/raft_hashicorp.go b/weed/server/raft_hashicorp.go
index c019082f0..0c6a72d6f 100644
--- a/weed/server/raft_hashicorp.go
+++ b/weed/server/raft_hashicorp.go
@@ -78,6 +78,7 @@ func (s *RaftServer) monitorLeaderLoop(updatePeers bool) {
 			}
 			glog.V(0).Infof("is leader %+v change event: %+v => %+v", isLeader, prevLeader, leader)
 			prevLeader = leader
+			s.topo.LastLeaderChangeTime = time.Now()
 		}
 	}
 }