diff --git a/codec/codec.go b/codec/codec.go
index 20231315..daaf6ee1 100644
--- a/codec/codec.go
+++ b/codec/codec.go
@@ -93,6 +93,8 @@ type RawMessage []byte
 func (m *RawMessage) MarshalJSON() ([]byte, error) {
 	if m == nil {
 		return []byte("null"), nil
+	} else if len(*m) == 0 {
+		return []byte("null"), nil
 	}
 	return *m, nil
 }