diff --git a/weed/util/log_buffer/log_buffer.go b/weed/util/log_buffer/log_buffer.go
index 86857b563..2d12a5bf2 100644
--- a/weed/util/log_buffer/log_buffer.go
+++ b/weed/util/log_buffer/log_buffer.go
@@ -118,6 +118,13 @@ func (m *LogBuffer) AddToBuffer(partitionKey, data []byte, processingTsNs int64)
 
 }
 
+func (m *LogBuffer) IsStopping() bool {
+	m.RLock()
+	defer m.RUnlock()
+
+	return m.isStopping
+}
+
 func (m *LogBuffer) Shutdown() {
 	m.Lock()
 	defer m.Unlock()
@@ -144,13 +151,12 @@ func (m *LogBuffer) loopFlush() {
 }
 
 func (m *LogBuffer) loopInterval() {
-	for !m.isStopping {
+	for !m.IsStopping() {
 		time.Sleep(m.flushInterval)
-		m.Lock()
-		if m.isStopping {
-			m.Unlock()
+		if m.IsStopping() {
 			return
 		}
+		m.Lock()
 		toFlush := m.copyToFlush()
 		m.Unlock()
 		if toFlush != nil {