diff --git a/common/buf/writer.go b/common/buf/writer.go
index 50ecbb8c..581a8668 100644
--- a/common/buf/writer.go
+++ b/common/buf/writer.go
@@ -60,12 +60,12 @@ func (w *BufferedWriter) Write(b []byte) (int, error) {
 		return w.legacyWriter.Write(b)
 	}
 
-	if w.buffer == nil {
-		w.buffer = New()
-	}
-
 	totalBytes := 0
 	for len(b) > 0 {
+		if w.buffer == nil {
+			w.buffer = New()
+		}
+
 		nBytes, err := w.buffer.Write(b)
 		totalBytes += nBytes
 		if err != nil {