diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go
index 70c1d70d5..ee57109ea 100644
--- a/go/weed/weed_server/volume_server_handlers.go
+++ b/go/weed/weed_server/volume_server_handlers.go
@@ -102,7 +102,10 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request)
 		mtype = mime.TypeByExtension(ext)
 	}
 	if n.MimeSize > 0 {
-		mtype = string(n.Mime)
+		mt := string(n.Mime)
+		if mt != "application/octet-stream" {
+			mtype = mt
+		}
 	}
 	if mtype != "" {
 		w.Header().Set("Content-Type", mtype)