diff --git a/Emby.Dlna/Main/DlnaHost.cs b/Emby.Dlna/Main/DlnaHost.cs
index 26bf6d5e2c..58db7c26fc 100644
--- a/Emby.Dlna/Main/DlnaHost.cs
+++ b/Emby.Dlna/Main/DlnaHost.cs
@@ -9,7 +9,6 @@ using System.Threading;
using System.Threading.Tasks;
using Emby.Dlna.PlayTo;
using Emby.Dlna.Ssdp;
-using Jellyfin.Networking.Configuration;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index a1f1cd6490..40aee063eb 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -41,7 +41,6 @@ using Emby.Server.Implementations.Updates;
using Jellyfin.Api.Helpers;
using Jellyfin.Drawing;
using Jellyfin.MediaEncoding.Hls.Playlist;
-using Jellyfin.Networking.Configuration;
using Jellyfin.Networking.Manager;
using Jellyfin.Server.Implementations;
using MediaBrowser.Common;
diff --git a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index d6da597b8b..c4cd935c37 100644
--- a/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/Emby.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -9,7 +9,7 @@ using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Plugins;
diff --git a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 662bd88a90..18e60b2101 100644
--- a/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/Emby.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -6,7 +6,6 @@ using System.Net.Sockets;
using System.Threading;
using System.Threading.Tasks;
using Emby.Server.Implementations.Udp;
-using Jellyfin.Networking.Configuration;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
diff --git a/Jellyfin.Api/Controllers/StartupController.cs b/Jellyfin.Api/Controllers/StartupController.cs
index 1098733b2c..fe99cee776 100644
--- a/Jellyfin.Api/Controllers/StartupController.cs
+++ b/Jellyfin.Api/Controllers/StartupController.cs
@@ -3,7 +3,7 @@ using System.Linq;
using System.Threading.Tasks;
using Jellyfin.Api.Constants;
using Jellyfin.Api.Models.StartupDtos;
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Library;
using Microsoft.AspNetCore.Authorization;
diff --git a/Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs b/Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs
index 2241c68e7a..cbd948db0a 100644
--- a/Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs
+++ b/Jellyfin.Api/Middleware/BaseUrlRedirectionMiddleware.cs
@@ -1,6 +1,6 @@
using System;
using System.Threading.Tasks;
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
diff --git a/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs b/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
index 94de30d1b1..d8c95ddffe 100644
--- a/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
+++ b/Jellyfin.Api/Middleware/LanFilteringMiddleware.cs
@@ -1,5 +1,4 @@
using System.Threading.Tasks;
-using Jellyfin.Networking.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
diff --git a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs b/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
deleted file mode 100644
index 90ebcd390e..0000000000
--- a/Jellyfin.Networking/Configuration/NetworkConfiguration.cs
+++ /dev/null
@@ -1,176 +0,0 @@
-#pragma warning disable CA1819 // Properties should not return arrays
-
-using System;
-
-namespace Jellyfin.Networking.Configuration
-{
- ///
- /// Defines the .
- ///
- public class NetworkConfiguration
- {
- ///
- /// The default value for .
- ///
- public const int DefaultHttpPort = 8096;
-
- ///
- /// The default value for and .
- ///
- public const int DefaultHttpsPort = 8920;
-
- private string _baseUrl = string.Empty;
-
- ///
- /// Gets or sets a value used to specify the URL prefix that your Jellyfin instance can be accessed at.
- ///
- public string BaseUrl
- {
- get => _baseUrl;
- set
- {
- // Normalize the start of the string
- if (string.IsNullOrWhiteSpace(value))
- {
- // If baseUrl is empty, set an empty prefix string
- _baseUrl = string.Empty;
- return;
- }
-
- if (value[0] != '/')
- {
- // If baseUrl was not configured with a leading slash, append one for consistency
- value = "/" + value;
- }
-
- // Normalize the end of the string
- if (value[^1] == '/')
- {
- // If baseUrl was configured with a trailing slash, remove it for consistency
- value = value.Remove(value.Length - 1);
- }
-
- _baseUrl = value;
- }
- }
-
- ///
- /// Gets or sets a value indicating whether to use HTTPS.
- ///
- ///
- /// In order for HTTPS to be used, in addition to setting this to true, valid values must also be
- /// provided for and .
- ///
- public bool EnableHttps { get; set; }
-
- ///
- /// Gets or sets a value indicating whether the server should force connections over HTTPS.
- ///
- public bool RequireHttps { get; set; }
-
- ///
- /// Gets or sets the filesystem path of an X.509 certificate to use for SSL.
- ///
- public string CertificatePath { get; set; } = string.Empty;
-
- ///
- /// Gets or sets the password required to access the X.509 certificate data in the file specified by .
- ///
- public string CertificatePassword { get; set; } = string.Empty;
-
- ///
- /// Gets or sets the internal HTTP server port.
- ///
- /// The HTTP server port.
- public int InternalHttpPort { get; set; } = DefaultHttpPort;
-
- ///
- /// Gets or sets the internal HTTPS server port.
- ///
- /// The HTTPS server port.
- public int InternalHttpsPort { get; set; } = DefaultHttpsPort;
-
- ///
- /// Gets or sets the public HTTP port.
- ///
- /// The public HTTP port.
- public int PublicHttpPort { get; set; } = DefaultHttpPort;
-
- ///
- /// Gets or sets the public HTTPS port.
- ///
- /// The public HTTPS port.
- public int PublicHttpsPort { get; set; } = DefaultHttpsPort;
-
- ///
- /// Gets or sets a value indicating whether Autodiscovery is enabled.
- ///
- public bool AutoDiscovery { get; set; } = true;
-
- ///
- /// Gets or sets a value indicating whether to enable automatic port forwarding.
- ///
- public bool EnableUPnP { get; set; }
-
- ///
- /// Gets or sets a value indicating whether IPv6 is enabled.
- ///
- public bool EnableIPv4 { get; set; } = true;
-
- ///
- /// Gets or sets a value indicating whether IPv6 is enabled.
- ///
- public bool EnableIPv6 { get; set; }
-
- ///
- /// Gets or sets a value indicating whether access from outside of the LAN is permitted.
- ///
- public bool EnableRemoteAccess { get; set; } = true;
-
- ///
- /// Gets or sets the subnets that are deemed to make up the LAN.
- ///
- public string[] LocalNetworkSubnets { get; set; } = Array.Empty();
-
- ///
- /// Gets or sets the interface addresses which Jellyfin will bind to. If empty, all interfaces will be used.
- ///
- public string[] LocalNetworkAddresses { get; set; } = Array.Empty();
-
- ///
- /// Gets or sets the known proxies.
- ///
- public string[] KnownProxies { get; set; } = Array.Empty();
-
- ///
- /// Gets or sets a value indicating whether address names that match should be ignored for the purposes of binding.
- ///
- public bool IgnoreVirtualInterfaces { get; set; } = true;
-
- ///
- /// Gets or sets a value indicating the interface name prefixes that should be ignored. The list can be comma separated and values are case-insensitive. .
- ///
- public string[] VirtualInterfaceNames { get; set; } = new string[] { "veth" };
-
- ///
- /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests.
- ///
- public bool EnablePublishedServerUriByRequest { get; set; } = false;
-
- ///
- /// Gets or sets the PublishedServerUriBySubnet
- /// Gets or sets PublishedServerUri to advertise for specific subnets.
- ///
- public string[] PublishedServerUriBySubnet { get; set; } = Array.Empty();
-
- ///
- /// Gets or sets the filter for remote IP connectivity. Used in conjunction with .
- ///
- public string[] RemoteIPFilter { get; set; } = Array.Empty();
-
- ///
- /// Gets or sets a value indicating whether contains a blacklist or a whitelist. Default is a whitelist.
- ///
- public bool IsRemoteIPFilterBlacklist { get; set; }
- }
-}
diff --git a/Jellyfin.Networking/Configuration/NetworkConfigurationExtensions.cs b/Jellyfin.Networking/Configuration/NetworkConfigurationExtensions.cs
deleted file mode 100644
index 3ba6bb8fcb..0000000000
--- a/Jellyfin.Networking/Configuration/NetworkConfigurationExtensions.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using MediaBrowser.Common.Configuration;
-
-namespace Jellyfin.Networking.Configuration
-{
- ///
- /// Defines the .
- ///
- public static class NetworkConfigurationExtensions
- {
- ///
- /// Retrieves the network configuration.
- ///
- /// The .
- /// The .
- public static NetworkConfiguration GetNetworkConfiguration(this IConfigurationManager config)
- {
- return config.GetConfiguration(NetworkConfigurationStore.StoreKey);
- }
- }
-}
diff --git a/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs b/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs
deleted file mode 100644
index 14726565aa..0000000000
--- a/Jellyfin.Networking/Configuration/NetworkConfigurationFactory.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
-
-namespace Jellyfin.Networking.Configuration
-{
- ///
- /// Defines the .
- ///
- public class NetworkConfigurationFactory : IConfigurationFactory
- {
- ///
- /// The GetConfigurations.
- ///
- /// The .
- public IEnumerable GetConfigurations()
- {
- return new[]
- {
- new NetworkConfigurationStore()
- };
- }
- }
-}
diff --git a/Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs b/Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs
deleted file mode 100644
index a268ebb68f..0000000000
--- a/Jellyfin.Networking/Configuration/NetworkConfigurationStore.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using MediaBrowser.Common.Configuration;
-
-namespace Jellyfin.Networking.Configuration
-{
- ///
- /// A configuration that stores network related settings.
- ///
- public class NetworkConfigurationStore : ConfigurationStore
- {
- ///
- /// The name of the configuration in the storage.
- ///
- public const string StoreKey = "network";
-
- ///
- /// Initializes a new instance of the class.
- ///
- public NetworkConfigurationStore()
- {
- ConfigurationType = typeof(NetworkConfiguration);
- Key = StoreKey;
- }
- }
-}
diff --git a/Jellyfin.Networking/Manager/NetworkManager.cs b/Jellyfin.Networking/Manager/NetworkManager.cs
index d631fa51f8..b0fe4aba65 100644
--- a/Jellyfin.Networking/Manager/NetworkManager.cs
+++ b/Jellyfin.Networking/Manager/NetworkManager.cs
@@ -7,7 +7,6 @@ using System.Net;
using System.Net.NetworkInformation;
using System.Net.Sockets;
using System.Threading;
-using Jellyfin.Networking.Configuration;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Net;
diff --git a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
index b6af9baec3..6066893de3 100644
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
using Jellyfin.Api.Middleware;
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using Microsoft.AspNetCore.Builder;
using Microsoft.OpenApi.Models;
diff --git a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
index a842274959..93df7d3156 100644
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -20,7 +20,6 @@ using Jellyfin.Api.Formatters;
using Jellyfin.Api.ModelBinders;
using Jellyfin.Data.Enums;
using Jellyfin.Extensions.Json;
-using Jellyfin.Networking.Configuration;
using Jellyfin.Server.Configuration;
using Jellyfin.Server.Filters;
using MediaBrowser.Common.Net;
diff --git a/Jellyfin.Server/Migrations/PreStartupRoutines/MigrateNetworkConfiguration.cs b/Jellyfin.Server/Migrations/PreStartupRoutines/MigrateNetworkConfiguration.cs
index c6d86b8cdb..d92c00991b 100644
--- a/Jellyfin.Server/Migrations/PreStartupRoutines/MigrateNetworkConfiguration.cs
+++ b/Jellyfin.Server/Migrations/PreStartupRoutines/MigrateNetworkConfiguration.cs
@@ -3,7 +3,7 @@ using System.IO;
using System.Xml;
using System.Xml.Serialization;
using Emby.Server.Implementations;
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
using Microsoft.Extensions.Logging;
namespace Jellyfin.Server.Migrations.PreStartupRoutines;
diff --git a/Jellyfin.Server/Startup.cs b/Jellyfin.Server/Startup.cs
index 2acddb243d..18d13c0563 100644
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -7,7 +7,6 @@ using System.Text;
using Emby.Dlna.Extensions;
using Jellyfin.Api.Middleware;
using Jellyfin.MediaEncoding.Hls.Extensions;
-using Jellyfin.Networking.Configuration;
using Jellyfin.Networking.HappyEyeballs;
using Jellyfin.Server.Extensions;
using Jellyfin.Server.HealthChecks;
diff --git a/MediaBrowser.Common/Net/NetworkConfiguration.cs b/MediaBrowser.Common/Net/NetworkConfiguration.cs
new file mode 100644
index 0000000000..61a51c99e2
--- /dev/null
+++ b/MediaBrowser.Common/Net/NetworkConfiguration.cs
@@ -0,0 +1,175 @@
+#pragma warning disable CA1819 // Properties should not return arrays
+
+using System;
+
+namespace MediaBrowser.Common.Net;
+
+///
+/// Defines the .
+///
+public class NetworkConfiguration
+{
+ ///
+ /// The default value for .
+ ///
+ public const int DefaultHttpPort = 8096;
+
+ ///
+ /// The default value for and .
+ ///
+ public const int DefaultHttpsPort = 8920;
+
+ private string _baseUrl = string.Empty;
+
+ ///
+ /// Gets or sets a value used to specify the URL prefix that your Jellyfin instance can be accessed at.
+ ///
+ public string BaseUrl
+ {
+ get => _baseUrl;
+ set
+ {
+ // Normalize the start of the string
+ if (string.IsNullOrWhiteSpace(value))
+ {
+ // If baseUrl is empty, set an empty prefix string
+ _baseUrl = string.Empty;
+ return;
+ }
+
+ if (value[0] != '/')
+ {
+ // If baseUrl was not configured with a leading slash, append one for consistency
+ value = "/" + value;
+ }
+
+ // Normalize the end of the string
+ if (value[^1] == '/')
+ {
+ // If baseUrl was configured with a trailing slash, remove it for consistency
+ value = value.Remove(value.Length - 1);
+ }
+
+ _baseUrl = value;
+ }
+ }
+
+ ///
+ /// Gets or sets a value indicating whether to use HTTPS.
+ ///
+ ///
+ /// In order for HTTPS to be used, in addition to setting this to true, valid values must also be
+ /// provided for and .
+ ///
+ public bool EnableHttps { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether the server should force connections over HTTPS.
+ ///
+ public bool RequireHttps { get; set; }
+
+ ///
+ /// Gets or sets the filesystem path of an X.509 certificate to use for SSL.
+ ///
+ public string CertificatePath { get; set; } = string.Empty;
+
+ ///
+ /// Gets or sets the password required to access the X.509 certificate data in the file specified by .
+ ///
+ public string CertificatePassword { get; set; } = string.Empty;
+
+ ///
+ /// Gets or sets the internal HTTP server port.
+ ///
+ /// The HTTP server port.
+ public int InternalHttpPort { get; set; } = DefaultHttpPort;
+
+ ///
+ /// Gets or sets the internal HTTPS server port.
+ ///
+ /// The HTTPS server port.
+ public int InternalHttpsPort { get; set; } = DefaultHttpsPort;
+
+ ///
+ /// Gets or sets the public HTTP port.
+ ///
+ /// The public HTTP port.
+ public int PublicHttpPort { get; set; } = DefaultHttpPort;
+
+ ///
+ /// Gets or sets the public HTTPS port.
+ ///
+ /// The public HTTPS port.
+ public int PublicHttpsPort { get; set; } = DefaultHttpsPort;
+
+ ///
+ /// Gets or sets a value indicating whether Autodiscovery is enabled.
+ ///
+ public bool AutoDiscovery { get; set; } = true;
+
+ ///
+ /// Gets or sets a value indicating whether to enable automatic port forwarding.
+ ///
+ public bool EnableUPnP { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether IPv6 is enabled.
+ ///
+ public bool EnableIPv4 { get; set; } = true;
+
+ ///
+ /// Gets or sets a value indicating whether IPv6 is enabled.
+ ///
+ public bool EnableIPv6 { get; set; }
+
+ ///
+ /// Gets or sets a value indicating whether access from outside of the LAN is permitted.
+ ///
+ public bool EnableRemoteAccess { get; set; } = true;
+
+ ///
+ /// Gets or sets the subnets that are deemed to make up the LAN.
+ ///
+ public string[] LocalNetworkSubnets { get; set; } = Array.Empty();
+
+ ///
+ /// Gets or sets the interface addresses which Jellyfin will bind to. If empty, all interfaces will be used.
+ ///
+ public string[] LocalNetworkAddresses { get; set; } = Array.Empty();
+
+ ///
+ /// Gets or sets the known proxies.
+ ///
+ public string[] KnownProxies { get; set; } = Array.Empty();
+
+ ///
+ /// Gets or sets a value indicating whether address names that match should be ignored for the purposes of binding.
+ ///
+ public bool IgnoreVirtualInterfaces { get; set; } = true;
+
+ ///
+ /// Gets or sets a value indicating the interface name prefixes that should be ignored. The list can be comma separated and values are case-insensitive. .
+ ///
+ public string[] VirtualInterfaceNames { get; set; } = new string[] { "veth" };
+
+ ///
+ /// Gets or sets a value indicating whether the published server uri is based on information in HTTP requests.
+ ///
+ public bool EnablePublishedServerUriByRequest { get; set; } = false;
+
+ ///
+ /// Gets or sets the PublishedServerUriBySubnet
+ /// Gets or sets PublishedServerUri to advertise for specific subnets.
+ ///
+ public string[] PublishedServerUriBySubnet { get; set; } = Array.Empty();
+
+ ///
+ /// Gets or sets the filter for remote IP connectivity. Used in conjunction with .
+ ///
+ public string[] RemoteIPFilter { get; set; } = Array.Empty();
+
+ ///
+ /// Gets or sets a value indicating whether contains a blacklist or a whitelist. Default is a whitelist.
+ ///
+ public bool IsRemoteIPFilterBlacklist { get; set; }
+}
diff --git a/MediaBrowser.Common/Net/NetworkConfigurationExtensions.cs b/MediaBrowser.Common/Net/NetworkConfigurationExtensions.cs
new file mode 100644
index 0000000000..9288964d22
--- /dev/null
+++ b/MediaBrowser.Common/Net/NetworkConfigurationExtensions.cs
@@ -0,0 +1,19 @@
+using MediaBrowser.Common.Configuration;
+
+namespace MediaBrowser.Common.Net;
+
+///
+/// Defines the .
+///
+public static class NetworkConfigurationExtensions
+{
+ ///
+ /// Retrieves the network configuration.
+ ///
+ /// The .
+ /// The .
+ public static NetworkConfiguration GetNetworkConfiguration(this IConfigurationManager config)
+ {
+ return config.GetConfiguration(NetworkConfigurationStore.StoreKey);
+ }
+}
diff --git a/MediaBrowser.Common/Net/NetworkConfigurationFactory.cs b/MediaBrowser.Common/Net/NetworkConfigurationFactory.cs
new file mode 100644
index 0000000000..9309834f4b
--- /dev/null
+++ b/MediaBrowser.Common/Net/NetworkConfigurationFactory.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using MediaBrowser.Common.Configuration;
+
+namespace MediaBrowser.Common.Net;
+
+///
+/// Defines the .
+///
+public class NetworkConfigurationFactory : IConfigurationFactory
+{
+ ///
+ /// The GetConfigurations.
+ ///
+ /// The .
+ public IEnumerable GetConfigurations()
+ {
+ return new[]
+ {
+ new NetworkConfigurationStore()
+ };
+ }
+}
diff --git a/MediaBrowser.Common/Net/NetworkConfigurationStore.cs b/MediaBrowser.Common/Net/NetworkConfigurationStore.cs
new file mode 100644
index 0000000000..d2f5187072
--- /dev/null
+++ b/MediaBrowser.Common/Net/NetworkConfigurationStore.cs
@@ -0,0 +1,23 @@
+using MediaBrowser.Common.Configuration;
+
+namespace MediaBrowser.Common.Net;
+
+///
+/// A configuration that stores network related settings.
+///
+public class NetworkConfigurationStore : ConfigurationStore
+{
+ ///
+ /// The name of the configuration in the storage.
+ ///
+ public const string StoreKey = "network";
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public NetworkConfigurationStore()
+ {
+ ConfigurationType = typeof(NetworkConfiguration);
+ Key = StoreKey;
+ }
+}
diff --git a/tests/Jellyfin.Networking.Tests/Configuration/NetworkConfigurationTests.cs b/tests/Jellyfin.Networking.Tests/Configuration/NetworkConfigurationTests.cs
index a78b872dff..30726f1d3c 100644
--- a/tests/Jellyfin.Networking.Tests/Configuration/NetworkConfigurationTests.cs
+++ b/tests/Jellyfin.Networking.Tests/Configuration/NetworkConfigurationTests.cs
@@ -1,4 +1,4 @@
-using Jellyfin.Networking.Configuration;
+using MediaBrowser.Common.Net;
using Xunit;
namespace Jellyfin.Networking.Tests.Configuration;
diff --git a/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs b/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs
index 2302f90b8d..0333d98e67 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkManagerTests.cs
@@ -1,6 +1,6 @@
using System.Net;
-using Jellyfin.Networking.Configuration;
using Jellyfin.Networking.Manager;
+using MediaBrowser.Common.Net;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
diff --git a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
index 97beb6940c..93514a5017 100644
--- a/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
+++ b/tests/Jellyfin.Networking.Tests/NetworkParseTests.cs
@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
-using Jellyfin.Networking.Configuration;
using Jellyfin.Networking.Manager;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
diff --git a/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs b/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
index 2881020375..e0b65cbc44 100644
--- a/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
+++ b/tests/Jellyfin.Server.Tests/ParseNetworkTests.cs
@@ -1,10 +1,10 @@
using System;
using System.Linq;
using System.Net;
-using Jellyfin.Networking.Configuration;
using Jellyfin.Networking.Manager;
using Jellyfin.Server.Extensions;
using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.HttpOverrides;
using Microsoft.Extensions.Configuration;