diff --git a/internal/server/rpc/gateway_rpc_servlet_handlers.go b/internal/server/rpc/gateway_rpc_servlet_handlers.go
index 08b5a6c..a540b51 100644
--- a/internal/server/rpc/gateway_rpc_servlet_handlers.go
+++ b/internal/server/rpc/gateway_rpc_servlet_handlers.go
@@ -39,9 +39,9 @@ func (sh *GatewayRPCServletHandlers) Invoke(servletCTX rpc.ServletContext, reque
 	md := servletCTX.GetAttribute(oogw.GRPCMetadataKey)
 	if nil == md {
 		md = metadata.Pairs(
-			oogw.GRPCClientTypeKey, servletCTX.GetAttribute(oogw.SocketIDKey).(string),
+			oogw.GRPCClientTypeKey, servletCTX.GetAttribute(oogw.ClientTypeKey).(string),
 			oogw.GRPCSessionIDKey, servletCTX.GetAttribute(oogw.SocketIDKey).(string),
-			oogw.GRPCTargetIDKey, servletCTX.GetAttribute(oogw.SocketIDKey).(string))
+			oogw.GRPCTargetIDKey, servletCTX.GetAttribute(oogw.TargetIDKey).(string))
 
 		servletCTX.SetAttribute(oogw.GRPCMetadataKey, md)
 	}