diff --git a/src/api/Server.ts b/src/api/Server.ts
index 5eda05d5a..f79e7dc5e 100644
--- a/src/api/Server.ts
+++ b/src/api/Server.ts
@@ -140,7 +140,7 @@ export class SpacebarServer extends Server {
         // current well-known location
         app.get("/.well-known/spacebar", (req, res) => {
             res.json({
-                api: Config.get().api.endpointPublic,
+                api: (Config.get().api.endpointPublic + "/api/").replace("//api/", "/api/"),
             });
         });
 
@@ -156,7 +156,7 @@ export class SpacebarServer extends Server {
 
             res.json({
                 api: {
-                    baseUrl: Config.get().api.endpointPublic?.split("/api/")[0] || "", // TODO: migrate database values to not include /api/v9
+                    baseUrl: Config.get().api.endpointPublic,
                     apiVersions: {
                         default: Config.get().api.defaultVersion,
                         active: Config.get().api.activeVersions,
diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts
index 3504a5166..339eedb1b 100644
--- a/src/api/routes/policies/instance/domains.ts
+++ b/src/api/routes/policies/instance/domains.ts
@@ -35,7 +35,7 @@ router.get(
 
         res.json({
             admin: Config.get().admin.endpointPublic,
-            api: Config.get().api.endpointPublic?.split("/api/")[0] || "", // Transitional, see /.well-known/spacebar/client
+            api: (Config.get().api.endpointPublic + "/api/").replace("//api/", "/api/"), // Transitional, see /.well-known/spacebar/client
             apiEndpoint: api.endpointPublic,
             cdn: cdn.endpointPublic,
             defaultApiVersion: api.defaultVersion,