diff --git a/src/eddn/Gateway.py b/src/eddn/Gateway.py
index 21d63bd..f3ccc17 100644
--- a/src/eddn/Gateway.py
+++ b/src/eddn/Gateway.py
@@ -127,7 +127,7 @@ def parse_and_error_handle(data):
             # If an IP hash is set, salt+hash the uploader's IP address and set
             # it as the EMDR upload key value.
             ip_hash = hashlib.sha1(ip_hash_salt + get_remote_address()).hexdigest()
-            parsed_message.upload_keys.append({'name': 'EMDR', 'key': ip_hash})
+            parsed_message['header']['uploaderKey'] = ip_hash
 
         # Sends the parsed MarketOrderList or MarketHistoryList to the Announcers
         # as compressed JSON.