diff --git a/fboss/agent/hw/sai/api/TamApi.h b/fboss/agent/hw/sai/api/TamApi.h
index a1292fd896718..e53161f722d49 100644
--- a/fboss/agent/hw/sai/api/TamApi.h
+++ b/fboss/agent/hw/sai/api/TamApi.h
@@ -184,7 +184,7 @@ struct SaiTamEventTraits {
       Attributes::Type,
       Attributes::ActionList,
       Attributes::CollectorList,
-      Attributes::SwitchEventType,
+      std::optional<Attributes::SwitchEventType>,
       std::optional<Attributes::DeviceId>,
       std::optional<Attributes::SwitchEventId>,
       std::optional<Attributes::ExtensionsCollectorList>,
diff --git a/fboss/agent/hw/sai/api/tests/TamApiTest.cpp b/fboss/agent/hw/sai/api/tests/TamApiTest.cpp
index cc45aabc0f1a0..a8f75303da3b1 100644
--- a/fboss/agent/hw/sai/api/tests/TamApiTest.cpp
+++ b/fboss/agent/hw/sai/api/tests/TamApiTest.cpp
@@ -154,8 +154,8 @@ TEST_F(TamApiTest, TamEvent) {
   std::get<SaiTamEventTraits::Attributes::ActionList>(eventAttr) = eventActions;
   std::get<SaiTamEventTraits::Attributes::CollectorList>(eventAttr) =
       eventCollectors;
-  std::get<SaiTamEventTraits::Attributes::SwitchEventType>(eventAttr) =
-      eventTypes;
+  std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventType>>(
+      eventAttr) = eventTypes;
   std::get<std::optional<SaiTamEventTraits::Attributes::DeviceId>>(eventAttr) =
       deviceId;
   std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventId>>(
diff --git a/fboss/agent/hw/sai/store/tests/TamStoreTest.cpp b/fboss/agent/hw/sai/store/tests/TamStoreTest.cpp
index ef570028b3f83..67ddb9bef67df 100644
--- a/fboss/agent/hw/sai/store/tests/TamStoreTest.cpp
+++ b/fboss/agent/hw/sai/store/tests/TamStoreTest.cpp
@@ -79,8 +79,8 @@ class TamStoreTest : public SaiStoreTest {
         SAI_TAM_EVENT_TYPE_PACKET_DROP;
     std::get<SaiTamEventTraits::Attributes::ActionList>(result) = actions;
     std::get<SaiTamEventTraits::Attributes::CollectorList>(result) = collectors;
-    std::get<SaiTamEventTraits::Attributes::SwitchEventType>(result) =
-        eventTypes;
+    std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventType>>(
+        result) = eventTypes;
     std::get<std::optional<SaiTamEventTraits::Attributes::DeviceId>>(result) =
         deviceId;
     std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventId>>(
@@ -293,8 +293,10 @@ TEST_F(TamStoreTest, tamCtors) {
       std::get<SaiTamEventTraits::Attributes::CollectorList>(tamEventAhk)
           .value());
   EXPECT_EQ(
-      GET_ATTR(TamEvent, SwitchEventType, eventObj.attributes()),
-      std::get<SaiTamEventTraits::Attributes::SwitchEventType>(tamEventAhk)
+      GET_OPT_ATTR(TamEvent, SwitchEventType, eventObj.attributes()),
+      std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventType>>(
+          tamEventAhk)
+          .value()
           .value());
 
   auto tamObj = createObj<SaiTamTraits>(tam);
@@ -425,8 +427,10 @@ TEST_F(TamStoreTest, setObject) {
       GET_ATTR(TamEvent, CollectorList, event->attributes()),
       std::get<SaiTamEventTraits::Attributes::CollectorList>(eventAhk).value());
   EXPECT_EQ(
-      GET_ATTR(TamEvent, SwitchEventType, event->attributes()),
-      std::get<SaiTamEventTraits::Attributes::SwitchEventType>(eventAhk)
+      GET_OPT_ATTR(TamEvent, SwitchEventType, event->attributes()),
+      std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventType>>(
+          eventAhk)
+          .value()
           .value());
 
   auto tamAhk = tamTraits(event->adapterKey());
@@ -470,11 +474,11 @@ TEST_F(TamStoreTest, updateObject) {
   auto tam = s.get<SaiTamTraits>().setObject(tamAhk, tamAhk);
 
   std::vector<sai_int32_t> newEvents = {4, 5, 6};
-  std::get<SaiTamEventTraits::Attributes::SwitchEventType>(eventAhk) =
-      newEvents;
+  std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventType>>(
+      eventAhk) = newEvents;
   auto updatedEvent = s.get<SaiTamEventTraits>().setObject(eventAhk, eventAhk);
   EXPECT_EQ(
-      GET_ATTR(TamEvent, SwitchEventType, updatedEvent->attributes()),
+      GET_OPT_ATTR(TamEvent, SwitchEventType, updatedEvent->attributes()),
       newEvents);
 
   std::get<SaiTamTransportTraits::Attributes::DstPort>(transportAhk) = 10003;
diff --git a/fboss/agent/hw/sai/switch/npu/tajo/SaiTamManager.cpp b/fboss/agent/hw/sai/switch/npu/tajo/SaiTamManager.cpp
index 516e449752de4..7d2e7a49ff80f 100644
--- a/fboss/agent/hw/sai/switch/npu/tajo/SaiTamManager.cpp
+++ b/fboss/agent/hw/sai/switch/npu/tajo/SaiTamManager.cpp
@@ -76,8 +76,8 @@ SaiTamManager::SaiTamManager(
   std::get<SaiTamEventTraits::Attributes::ActionList>(eventTraits) = actions;
   std::get<SaiTamEventTraits::Attributes::CollectorList>(eventTraits) =
       collectors;
-  std::get<SaiTamEventTraits::Attributes::SwitchEventType>(eventTraits) =
-      eventTypes;
+  std::get<std::optional<SaiTamEventTraits::Attributes::SwitchEventType>>(
+      eventTraits) = eventTypes;
   auto& eventStore = saiStore_->get<SaiTamEventTraits>();
   auto event = eventStore.setObject(eventTraits, eventTraits);