diff --git a/dataplane/saiserver/attrmgr/attrmgr.go b/dataplane/saiserver/attrmgr/attrmgr.go
index 28a95c390..976ed38f4 100644
--- a/dataplane/saiserver/attrmgr/attrmgr.go
+++ b/dataplane/saiserver/attrmgr/attrmgr.go
@@ -48,6 +48,7 @@ type AttrMgr struct {
 	// msgEnumToFieldNum maps a proto message name to a map of an attribute enum to its corresponding proto field.
 	// For example, for SwitchAttribute SWITCH_ATTR_MAX_SYSTEM_CORES (enum val 182) -> field max_system_cores (num 172)
 	msgEnumToFieldNum map[string]map[int32]int
+	switchID          string
 }
 
 func deleteOID(mgr *AttrMgr, oid string) error {
@@ -57,6 +58,9 @@ func deleteOID(mgr *AttrMgr, oid string) error {
 		return fmt.Errorf("OID not found: %s", oid)
 	}
 	delete(mgr.attrs, oid)
+	if oid == mgr.switchID {
+		mgr.switchID = ""
+	}
 	return nil
 }
 
@@ -133,6 +137,14 @@ func (mgr *AttrMgr) Interceptor(ctx context.Context, req any, info *grpc.UnarySe
 			return nil, err
 		}
 	case strings.Contains(info.FullMethod, "Remove"):
+		switchID, ok := mgr.GetSwitchID()
+		if ok {
+			val := mgr.GetAttribute(switchID, int32(saipb.SwitchAttr_SWITCH_ATTR_RESTART_WARM))
+			if isWarm, ok := val.(bool); ok && isWarm {
+				slog.InfoContext(ctx, "attrmgr.Interceptor: Skipping attribute deletion for RemoveSwitch RPC during warm restart.")
+				return respMsg, nil
+			}
+		}
 		id, err := mgr.getID(reqMsg, respMsg)
 		if err != nil {
 			slog.WarnContext(ctx, "failed to get id", "err", err)
@@ -152,6 +164,7 @@ func (mgr *AttrMgr) Reset() {
 	mgr.attrs = make(map[string]map[int32]*protoreflect.Value)
 	mgr.idToType = make(map[string]saipb.ObjectType)
 	mgr.msgEnumToFieldNum = make(map[string]map[int32]int)
+	mgr.switchID = ""
 	mgr.nextOid.Store(0)
 }
 
@@ -268,11 +281,36 @@ func (mgr *AttrMgr) GetType(id string) saipb.ObjectType {
 	return val
 }
 
+// GetAttribute returns the value of the requested attribute.
+func (mgr *AttrMgr) GetAttribute(id string, attr int32) any {
+	mgr.mu.Lock()
+	defer mgr.mu.Unlock()
+	if objAttrs, ok := mgr.attrs[id]; ok {
+		if val := objAttrs[attr]; val != nil {
+			return val.Interface()
+		}
+	}
+	return nil
+}
+
+// GetSwitchID returns the ID of the switch if it exists.
+func (mgr *AttrMgr) GetSwitchID() (string, bool) {
+	mgr.mu.Lock()
+	defer mgr.mu.Unlock()
+	if mgr.switchID != "" {
+		return mgr.switchID, true
+	}
+	return "", false
+}
+
 // GetType returns the SAI type for the object.
 func (mgr *AttrMgr) SetType(id string, t saipb.ObjectType) {
 	mgr.mu.Lock()
 	defer mgr.mu.Unlock()
 	mgr.idToType[id] = t
+	if t == saipb.ObjectType_OBJECT_TYPE_SWITCH {
+		mgr.switchID = id
+	}
 }
 
 // storeAttributes stores all the attributes in the message.
diff --git a/dataplane/saiserver/saiserver.go b/dataplane/saiserver/saiserver.go
index 252c0872d..6b98465bf 100644
--- a/dataplane/saiserver/saiserver.go
+++ b/dataplane/saiserver/saiserver.go
@@ -149,8 +149,17 @@ func (s *Server) ObjectTypeQuery(ctx context.Context, req *saipb.ObjectTypeQuery
 }
 
 func (s *Server) Initialize(ctx context.Context, _ *saipb.InitializeRequest) (*saipb.InitializeResponse, error) {
-	if s.initialized {
-		slog.InfoContext(ctx, "dataplane already intialized, reseting")
+	isWarmRestart := false
+
+	if switchID, ok := s.mgr.GetSwitchID(); ok {
+		val := s.mgr.GetAttribute(switchID, int32(saipb.SwitchAttr_SWITCH_ATTR_RESTART_WARM))
+		if isWarm, ok := val.(bool); ok {
+			isWarmRestart = isWarm
+		}
+	}
+
+	if s.initialized && !isWarmRestart {
+		slog.InfoContext(ctx, "dataplane already initialized, resetting")
 		s.mgr.Reset()
 		s.saiSwitch.Reset()
 		if err := s.Reset(ctx); err != nil {
diff --git a/dataplane/saiserver/switch.go b/dataplane/saiserver/switch.go
index 83f60fd49..0baa3d544 100644
--- a/dataplane/saiserver/switch.go
+++ b/dataplane/saiserver/switch.go
@@ -248,9 +248,25 @@ func newSwitch(mgr *attrmgr.AttrMgr, engine switchDataplaneAPI, s *grpc.Server,
 	return sw, nil
 }
 
+func (sw *saiSwitch) RemoveSwitch(ctx context.Context, req *saipb.RemoveSwitchRequest) (*saipb.RemoveSwitchResponse, error) {
+	slog.InfoContext(ctx, "RemoveSwitch called", "id", req.GetOid())
+	return &saipb.RemoveSwitchResponse{}, nil
+}
+
 // CreateSwitch a creates a new switch and populates its default values.
 func (sw *saiSwitch) CreateSwitch(ctx context.Context, _ *saipb.CreateSwitchRequest) (*saipb.CreateSwitchResponse, error) {
+	if id, ok := sw.mgr.GetSwitchID(); ok {
+		oid, err := strconv.ParseUint(id, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		slog.InfoContext(ctx, "Using existing switch id", "id", id)
+		return &saipb.CreateSwitchResponse{
+			Oid: oid,
+		}, nil
+	}
 	swID := sw.mgr.NextID()
+	slog.InfoContext(ctx, "Creating new switch id", "id", swID)
 
 	// Setup forwarding tables.
 	ingressVRF := &fwdpb.TableCreateRequest{