diff --git a/weed/topology/topology.go b/weed/topology/topology.go
index d704a5636..4cbe22a42 100644
--- a/weed/topology/topology.go
+++ b/weed/topology/topology.go
@@ -37,7 +37,7 @@ type Topology struct {
 	chanFullVolumes    chan storage.VolumeInfo
 	chanCrowdedVolumes chan storage.VolumeInfo
 
-	Configuration      *Configuration
+	Configuration *Configuration
 
 	RaftServer raft.Server
 }
@@ -70,6 +70,11 @@ func (t *Topology) IsLeader() bool {
 		if t.RaftServer.State() == raft.Leader {
 			return true
 		}
+		if leader, err := t.Leader(); err == nil {
+			if t.RaftServer.Name() == leader {
+				return true
+			}
+		}
 	}
 	return false
 }