diff --git a/awx/main/conf.py b/awx/main/conf.py
index c9f9564f92..6cecb9ec05 100644
--- a/awx/main/conf.py
+++ b/awx/main/conf.py
@@ -315,12 +315,12 @@ register(
     category_slug='logging',
 )
 register(
-    'LOG_TOWER_UUID',
+    'LOG_AGGREGATOR_TOWER_UUID',
     field_class=fields.CharField,
     allow_blank=True,
     label=_('Cluster-wide Tower unique identifier.'),
     help_text=_('Useful to uniquely identify Tower instances.'),
     category=_('Logging'),
     category_slug='logging',
-    default=uuid.uuid4(),
+    default=None,
 )
diff --git a/awx/main/utils/formatters.py b/awx/main/utils/formatters.py
index da5df45726..e6095c11d7 100644
--- a/awx/main/utils/formatters.py
+++ b/awx/main/utils/formatters.py
@@ -12,6 +12,7 @@ class LogstashFormatter(LogstashFormatterVersion1):
     def __init__(self, **kwargs):
         ret = super(LogstashFormatter, self).__init__(**kwargs)
         self.host_id = settings.CLUSTER_HOST_ID
+        self.tower_uuid = getattr(settings, "LOG_AGGREGATOR_TOWER_UUID", None)
         return ret
 
     def reformat_data_for_log(self, raw_data, kind=None):
@@ -135,7 +136,6 @@ class LogstashFormatter(LogstashFormatterVersion1):
             'message': record.getMessage(),
             'host': self.host,
             'type': self.message_type,
-            'tower_uuid': getattr(settings, 'LOG_TOWER_UUID', None),
 
             # Extra Fields
             'level': record.levelname,
@@ -143,6 +143,9 @@ class LogstashFormatter(LogstashFormatterVersion1):
             'cluster_host_id': self.host_id
         }
 
+        if self.tower_uuid:
+            message['tower_uuid'] = self.tower_uuid
+
         # Add extra fields
         message.update(self.get_extra_fields(record))