diff --git a/osu.Game/Online/EndpointConfiguration.cs b/osu.Game/Online/EndpointConfiguration.cs
index f3bcced630..bd3c945124 100644
--- a/osu.Game/Online/EndpointConfiguration.cs
+++ b/osu.Game/Online/EndpointConfiguration.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Online
 {
     /// <summary>
@@ -13,36 +11,36 @@ namespace osu.Game.Online
         /// <summary>
         /// The base URL for the website.
         /// </summary>
-        public string WebsiteRootUrl { get; set; }
+        public string WebsiteRootUrl { get; set; } = string.Empty;
 
         /// <summary>
         /// The endpoint for the main (osu-web) API.
         /// </summary>
-        public string APIEndpointUrl { get; set; }
+        public string APIEndpointUrl { get; set; } = string.Empty;
 
         /// <summary>
         /// The OAuth client secret.
         /// </summary>
-        public string APIClientSecret { get; set; }
+        public string APIClientSecret { get; set; } = string.Empty;
 
         /// <summary>
         /// The OAuth client ID.
         /// </summary>
-        public string APIClientID { get; set; }
+        public string APIClientID { get; set; } = string.Empty;
 
         /// <summary>
         /// The endpoint for the SignalR spectator server.
         /// </summary>
-        public string SpectatorEndpointUrl { get; set; }
+        public string SpectatorEndpointUrl { get; set; } = string.Empty;
 
         /// <summary>
         /// The endpoint for the SignalR multiplayer server.
         /// </summary>
-        public string MultiplayerEndpointUrl { get; set; }
+        public string MultiplayerEndpointUrl { get; set; } = string.Empty;
 
         /// <summary>
         /// The endpoint for the SignalR metadata server.
         /// </summary>
-        public string MetadataEndpointUrl { get; set; }
+        public string MetadataEndpointUrl { get; set; } = string.Empty;
     }
 }
diff --git a/osu.Game/Online/ExperimentalEndpointConfiguration.cs b/osu.Game/Online/ExperimentalEndpointConfiguration.cs
deleted file mode 100644
index c3d0014c8b..0000000000
--- a/osu.Game/Online/ExperimentalEndpointConfiguration.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace osu.Game.Online
-{
-    public class ExperimentalEndpointConfiguration : EndpointConfiguration
-    {
-        public ExperimentalEndpointConfiguration()
-        {
-            WebsiteRootUrl = @"https://osu.ppy.sh";
-            APIEndpointUrl = @"https://lazer.ppy.sh";
-            APIClientSecret = @"FGc9GAtyHzeQDshWP5Ah7dega8hJACAJpQtw6OXk";
-            APIClientID = "5";
-            SpectatorEndpointUrl = "https://spectator.ppy.sh/spectator";
-            MultiplayerEndpointUrl = "https://spectator.ppy.sh/multiplayer";
-            MetadataEndpointUrl = "https://spectator.ppy.sh/metadata";
-        }
-    }
-}
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 2208f7d7ca..a2a6322665 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -102,7 +102,7 @@ namespace osu.Game
         public virtual bool UseDevelopmentServer => DebugUtils.IsDebugBuild;
 
         public virtual EndpointConfiguration CreateEndpoints() =>
-            UseDevelopmentServer ? new DevelopmentEndpointConfiguration() : new ExperimentalEndpointConfiguration();
+            UseDevelopmentServer ? new DevelopmentEndpointConfiguration() : new ProductionEndpointConfiguration();
 
         public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();