diff --git a/dataplane/saiserver/saiserver.go b/dataplane/saiserver/saiserver.go
index 8a18dfdc5..252c0872d 100644
--- a/dataplane/saiserver/saiserver.go
+++ b/dataplane/saiserver/saiserver.go
@@ -135,6 +135,7 @@ type Server struct {
 	saiSwitch    *saiSwitch
 	systemPort   *systemPort
 	tam          *tam
+	lag          *lag
 }
 
 func (s *Server) ObjectTypeQuery(ctx context.Context, req *saipb.ObjectTypeQueryRequest) (*saipb.ObjectTypeQueryResponse, error) {
@@ -213,6 +214,7 @@ func New(ctx context.Context, mgr *attrmgr.AttrMgr, s *grpc.Server, opts *dplane
 		saiSwitch:         sw,
 		systemPort:        &systemPort{},
 		tam:               &tam{},
+		lag:               sw.Lag,
 	}
 	fwdpb.RegisterForwardingServer(s, fwdCtx)
 	fwdpb.RegisterInfoServer(s, fwdCtx)
diff --git a/dataplane/saiserver/switch.go b/dataplane/saiserver/switch.go
index 724b0eed5..3f8d170b4 100644
--- a/dataplane/saiserver/switch.go
+++ b/dataplane/saiserver/switch.go
@@ -56,7 +56,7 @@ type saiSwitch struct {
 	nextHop         *nextHop
 	policer         *policer
 	route           *route
-	lag             *lag
+	Lag             *lag
 	tunnel          *tunnel
 	queue           *queue
 	sg              *schedulerGroup
@@ -230,7 +230,7 @@ func newSwitch(mgr *attrmgr.AttrMgr, engine switchDataplaneAPI, s *grpc.Server,
 		nextHop:         newNextHop(mgr, engine, s),
 		route:           newRoute(mgr, engine, s),
 		routerInterface: newRouterInterface(mgr, engine, s),
-		lag:             newLAG(mgr, engine, s),
+		Lag:             newLAG(mgr, engine, s),
 		tunnel:          newTunnel(mgr, engine, s),
 		udf:             newUdf(mgr, engine, s),
 		scheduler:       newScheduler(mgr, engine, s),