diff --git a/server/rpc_codec.go b/server/rpc_codec.go
index 847c5ae9..a06c3c3c 100644
--- a/server/rpc_codec.go
+++ b/server/rpc_codec.go
@@ -153,9 +153,15 @@ func (c *rpcCodec) ReadHeader(r *codec.Message, t codec.MessageType) error {
 	err := c.codec.ReadHeader(&m, codec.Request)
 
 	// set the method/id
+	r.Method = m.Method
 	r.Endpoint = m.Endpoint
 	r.Id = m.Id
 
+	// TODO: remove the old legacy cruft
+	if len(r.Endpoint) == 0 {
+		r.Endpoint = r.Method
+	}
+
 	return err
 }