diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index 6ead7df..8cc698a 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -144,7 +144,7 @@ def parse_and_error_handle(data):
 
     if validationResults.severity <= ValidationSeverity.WARN:
         parsed_message['header']['gatewayTimestamp']    = datetime.utcnow().isoformat() + 'Z'
-        parsed_message['header']['uploaderIP']          = get_remote_address()
+        #parsed_message['header']['uploaderIP']          = get_remote_address()
 
         # Sends the parsed to the Relay/Monitor as compressed JSON.
         gevent.spawn(push_message, parsed_message, parsed_message['$schemaRef'])
diff --git a/src/eddn/Relay.py b/src/eddn/Relay.py
index 10db7d2..f240e27 100644
--- a/src/eddn/Relay.py
+++ b/src/eddn/Relay.py
@@ -96,8 +96,8 @@ class Relay(Thread):
                     return
             
             # Remove IP to end consumer
-            if 'uploaderIP' in message['header']:
-                del message['header']['uploaderIP']
+            #if 'uploaderIP' in message['header']:
+            #    del message['header']['uploaderIP']
             
             # Convert messgae back to JSON
             message = simplejson.dumps(message, sort_keys=True)