diff --git a/transport/http2_client.go b/transport/http2_client.go
index 02147e97..eac2ce99 100644
--- a/transport/http2_client.go
+++ b/transport/http2_client.go
@@ -295,9 +295,9 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (_ *Strea
 		hasMD = true
 		for k, v := range md {
 			for _, entry := range v {
-			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+				t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+			}
 		}
-	}
 
 	}
 	first := true
diff --git a/transport/http2_server.go b/transport/http2_server.go
index a8e78cdb..006ddeae 100644
--- a/transport/http2_server.go
+++ b/transport/http2_server.go
@@ -440,10 +440,10 @@ func (t *http2Server) WriteHeader(s *Stream, md metadata.MD) error {
 	t.hEnc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
 	t.hEnc.WriteField(hpack.HeaderField{Name: "content-type", Value: "application/grpc"})
 	for k, v := range md {
-		for _, entry := range v{
-		t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+		for _, entry := range v {
+			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+		}
 	}
-}
 
 	if err := t.writeHeaders(s, t.hBuf, false); err != nil {
 		return err
@@ -477,9 +477,9 @@ func (t *http2Server) WriteStatus(s *Stream, statusCode codes.Code, statusDesc s
 	// Attach the trailer metadata.
 	for k, v := range s.trailer {
 		for _, entry := range v {
-		t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+			t.hEnc.WriteField(hpack.HeaderField{Name: k, Value: entry})
+		}
 	}
-}
 	if err := t.writeHeaders(s, t.hBuf, true); err != nil {
 		t.Close()
 		return err