diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go
index 460b09af7..dcf3a55f2 100644
--- a/weed/s3api/s3api_server.go
+++ b/weed/s3api/s3api_server.go
@@ -221,6 +221,7 @@ func (s3a *S3ApiServer) getFilerAddress() pb.ServerAddress {
 	if len(s3a.option.Filers) > 0 {
 		return s3a.option.Filers[0]
 	}
+	glog.Warningf("getFilerAddress: no filer addresses available")
 	return ""
 }
 
diff --git a/weed/wdclient/filer_client.go b/weed/wdclient/filer_client.go
index 5dd0f08d7..f3082d970 100644
--- a/weed/wdclient/filer_client.go
+++ b/weed/wdclient/filer_client.go
@@ -56,10 +56,11 @@ type FilerClient struct {
 	retryBackoffFactor float64       // Retry: backoff multiplier for wait time
 	
 	// Filer discovery fields
-	masterClient      *MasterClient // Optional: for discovering filers in the same group
-	filerGroup        string        // Optional: filer group for discovery
-	discoveryInterval time.Duration // How often to refresh filer list from master
-	stopDiscovery     chan struct{} // Signal to stop discovery goroutine
+	masterClient       *MasterClient // Optional: for discovering filers in the same group
+	filerGroup         string        // Optional: filer group for discovery
+	discoveryInterval  time.Duration // How often to refresh filer list from master
+	stopDiscovery      chan struct{} // Signal to stop discovery goroutine
+	closeDiscoveryOnce sync.Once     // Ensures discovery channel is closed at most once
 }
 
 // filerVolumeProvider implements VolumeLocationProvider by querying filer
@@ -205,9 +206,12 @@ func (fc *FilerClient) GetCurrentFiler() pb.ServerAddress {
 }
 
 // Close stops the filer discovery goroutine if running
+// Safe to call multiple times (idempotent)
 func (fc *FilerClient) Close() {
 	if fc.stopDiscovery != nil {
-		close(fc.stopDiscovery)
+		fc.closeDiscoveryOnce.Do(func() {
+			close(fc.stopDiscovery)
+		})
 	}
 }
 
@@ -415,8 +419,15 @@ func (fc *FilerClient) shouldSkipUnhealthyFilerWithHealth(health *filerHealth) b
 
 // Deprecated: Use shouldSkipUnhealthyFilerWithHealth instead
 // This function is kept for backward compatibility but requires array access
+// Note: Accesses filerHealth without lock; safe only when discovery is disabled
 func (fc *FilerClient) shouldSkipUnhealthyFiler(index int32) bool {
+	fc.filerAddressesMu.RLock()
+	if index >= int32(len(fc.filerHealth)) {
+		fc.filerAddressesMu.RUnlock()
+		return true // Invalid index - skip
+	}
 	health := fc.filerHealth[index]
+	fc.filerAddressesMu.RUnlock()
 	return fc.shouldSkipUnhealthyFilerWithHealth(health)
 }
 
@@ -427,7 +438,14 @@ func (fc *FilerClient) recordFilerSuccessWithHealth(health *filerHealth) {
 
 // recordFilerSuccess resets failure tracking for a successful filer
 func (fc *FilerClient) recordFilerSuccess(index int32) {
-	fc.recordFilerSuccessWithHealth(fc.filerHealth[index])
+	fc.filerAddressesMu.RLock()
+	if index >= int32(len(fc.filerHealth)) {
+		fc.filerAddressesMu.RUnlock()
+		return // Invalid index
+	}
+	health := fc.filerHealth[index]
+	fc.filerAddressesMu.RUnlock()
+	fc.recordFilerSuccessWithHealth(health)
 }
 
 // recordFilerFailureWithHealth increments failure count for an unhealthy filer
@@ -438,7 +456,14 @@ func (fc *FilerClient) recordFilerFailureWithHealth(health *filerHealth) {
 
 // recordFilerFailure increments failure count for an unhealthy filer
 func (fc *FilerClient) recordFilerFailure(index int32) {
-	fc.recordFilerFailureWithHealth(fc.filerHealth[index])
+	fc.filerAddressesMu.RLock()
+	if index >= int32(len(fc.filerHealth)) {
+		fc.filerAddressesMu.RUnlock()
+		return // Invalid index
+	}
+	health := fc.filerHealth[index]
+	fc.filerAddressesMu.RUnlock()
+	fc.recordFilerFailureWithHealth(health)
 }
 
 // LookupVolumeIds queries the filer for volume locations with automatic failover
@@ -580,5 +605,8 @@ func (p *filerVolumeProvider) LookupVolumeIds(ctx context.Context, volumeIds []s
 	}
 
 	// All retries exhausted
-	return nil, fmt.Errorf("all %d filer(s) failed after %d attempts, last error: %w", len(fc.filerAddresses), maxRetries, lastErr)
+	fc.filerAddressesMu.RLock()
+	totalFilers := len(fc.filerAddresses)
+	fc.filerAddressesMu.RUnlock()
+	return nil, fmt.Errorf("all %d filer(s) failed after %d attempts, last error: %w", totalFilers, maxRetries, lastErr)
 }