diff --git a/resources/lib/helper/loghandler.py b/resources/lib/helper/loghandler.py
index 5890bb7a..8fe0ea17 100644
--- a/resources/lib/helper/loghandler.py
+++ b/resources/lib/helper/loghandler.py
@@ -53,9 +53,6 @@ class LogHandler(logging.StreamHandler):
             if server.get('LocalAddress'):
                 self.sensitive['Server'].append(server['LocalAddress'].split('://')[1])
 
-            if server.get('RemoteAddress'):
-                self.sensitive['Server'].append(server['RemoteAddress'].split('://')[1])
-
             if server.get('ManualAddress'):
                 self.sensitive['Server'].append(server['ManualAddress'].split('://')[1])
 
diff --git a/resources/lib/jellyfin/core/connection_manager.py b/resources/lib/jellyfin/core/connection_manager.py
index 7d197de6..b2d966a3 100644
--- a/resources/lib/jellyfin/core/connection_manager.py
+++ b/resources/lib/jellyfin/core/connection_manager.py
@@ -599,8 +599,6 @@ class ConnectionManager(object):
 
         if system_info.get('LocalAddress'):
             server['LocalAddress'] = system_info['LocalAddress']
-        if system_info.get('WanAddress'):
-            server['RemoteAddress'] = system_info['WanAddress']
         if 'MacAddress' in system_info:
             server['WakeOnLanInfos'] = [{'MacAddress': system_info['MacAddress']}]
 
diff --git a/resources/lib/jellyfin/core/credentials.py b/resources/lib/jellyfin/core/credentials.py
index aa1838b3..56e2f6e3 100644
--- a/resources/lib/jellyfin/core/credentials.py
+++ b/resources/lib/jellyfin/core/credentials.py
@@ -99,9 +99,6 @@ class Credentials(object):
                 if server.get('ExchangeToken'):
                     existing['ExchangeToken'] = server['ExchangeToken']
 
-                if server.get('RemoteAddress'):
-                    existing['RemoteAddress'] = server['RemoteAddress']
-
                 if server.get('ManualAddress'):
                     existing['ManualAddress'] = server['ManualAddress']