diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index 6c78f53b..e7b5dc3e 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -794,7 +794,7 @@ def commit_clear():
     # currently just 'autosense' which is intended to be active
     # per collective member
     for globvar in _oldcfgstore.get('globals', ()):
-        if globvar.endswith('_key'):
+        if globvar.endswith('_key') or globvar == 'confluent_uuid':
             continue
         _cfgstore['globals'][globvar] = _oldcfgstore['globals'][globvar]
     _oldcfgstore = None
diff --git a/confluent_server/confluent/discovery/protocols/ssdp.py b/confluent_server/confluent/discovery/protocols/ssdp.py
index 393ffef0..afd212fd 100644
--- a/confluent_server/confluent/discovery/protocols/ssdp.py
+++ b/confluent_server/confluent/discovery/protocols/ssdp.py
@@ -145,7 +145,6 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
     net4.bind(('', 1900))
     net6.bind(('', 1900))
     peerbymacaddress = {}
-    myuuid = cfm.get_global('confluent_uuid')
     while True:
         try:
             newmacs = set([])
@@ -190,6 +189,7 @@ def snoop(handler, byehandler=None, protocol=None, uuidlookup=None):
                                 for query in headline[-1].split('/'):
                                     node = None
                                     if query.startswith('confluentuuid='):
+                                        myuuid = cfm.get_global('confluent_uuid')
                                         curruuid = query.split('=', 1)[1].lower()
                                         if curruuid != myuuid:
                                             break