diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index 84cb175..d5f4b17 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -146,7 +146,7 @@ def parse_and_error_handle(data):
         parsed_message['header']['gatewayTimestamp']    = datetime.utcnow().isoformat() + 'Z'
         parsed_message['header']['uploaderIP']          = get_remote_address()        
 
-        # Sends the parsed to the Relay/Monitor as compressed JSON.
+        # Sends the parsed message to the Relay/Monitor as compressed JSON.
         gevent.spawn(push_message, parsed_message, parsed_message['$schemaRef'])
         logger.info("Accepted %s upload from %s" % (
             parsed_message, get_remote_address()
diff --git a/src/eddn/Relay.py b/src/eddn/Relay.py
index 6370e02..c2300e5 100644
--- a/src/eddn/Relay.py
+++ b/src/eddn/Relay.py
@@ -95,6 +95,10 @@ class Relay(Thread):
                     statsCollector.tally("duplicate")
                     return
             
+            # Remove ID to end consumer (Avoid realtime user tracking without their consent)
+            if 'uploaderID' in json['header']:
+                del json['header']['uploaderID']
+            
             # Remove IP to end consumer
             if 'uploaderIP' in json['header']:
                 del json['header']['uploaderIP']