diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index 6c7ebd71..528924e8 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -2209,7 +2209,7 @@ class ConfigManager(object):
         if cfgleader:
             mywarnings = exec_on_leader('_rpc_master_clear_node_attributes',
                                   self.tenant, nodes, attributes)
-            if warnings is not None:
+            if mywarnings and warnings is not None:
                 warnings.extend(mywarnings)
             return
         if cfgstreams: