diff --git a/orchagent/switch/swcap.cpp b/orchagent/switch/swcap.cpp
index 85714b3102..da6af31f50 100644
--- a/orchagent/switch/swcap.cpp
+++ b/orchagent/switch/swcap.cpp
@@ -178,7 +178,7 @@ sai_status_t SwitchCapabilities::queryEnumCapabilitiesSai(std::vector<sai_int32_
     sai_s32_list_t enumList = { .count = 0, .list = nullptr };
 
     auto status = sai_query_attribute_enum_values_capability(gSwitchId, objType, attrId, &enumList);
-    if (status != SAI_STATUS_BUFFER_OVERFLOW)
+    if ((status != SAI_STATUS_SUCCESS) && (status != SAI_STATUS_BUFFER_OVERFLOW))
     {
         return status;
     }