diff --git a/orchagent/switchorch.cpp b/orchagent/switchorch.cpp
index e03f5f08dc..b8e0090259 100644
--- a/orchagent/switchorch.cpp
+++ b/orchagent/switchorch.cpp
@@ -609,11 +609,18 @@ void SwitchOrch::doAppSwitchTableTask(Consumer &consumer)
                         invalid_attr = true;
                         break;
                 }
-                if (invalid_attr || unsupported_attr)
+                if (invalid_attr)
                 {
                     /* break from kfvFieldsValues for loop */
+                    SWSS_LOG_ERROR("Invalid Attribute %s", attribute.c_str());
+                    // Will not continue to set the rest of the attributes
                     break;
                 }
+                if (unsupported_attr){
+                    SWSS_LOG_ERROR("Unsupported Attribute %s", attribute.c_str());
+                    // Continue to set the rest of the attributes, even if current attribute is unsupported
+                    continue;
+                }
 
                 sai_status_t status = sai_switch_api->set_switch_attribute(gSwitchId, &attr);
                 if (status != SAI_STATUS_SUCCESS)