diff --git a/core/frontend/src/admin-auth/message-handler.js b/core/frontend/src/admin-auth/message-handler.js
index b70f430aa2..191620fa6b 100644
--- a/core/frontend/src/admin-auth/message-handler.js
+++ b/core/frontend/src/admin-auth/message-handler.js
@@ -1,3 +1,5 @@
+const adminUrl = window.location.href.replace('auth-frame/', '');
+
 window.addEventListener('message', async function (event) {
     if (event.origin !== '*') {
         // return;
@@ -20,7 +22,7 @@ window.addEventListener('message', async function (event) {
     if (data.action === 'getUser') {
         try {
             const res = await fetch(
-                'https://admin.egg/blog/ghost/api/canary/admin/users/me/'
+                adminUrl + 'api/canary/admin/users/me/'
             );
             const json = await res.json();
             respond(null, json);
@@ -31,7 +33,7 @@ window.addEventListener('message', async function (event) {
 
     if (data.action === 'hideComment') {
         try {
-            const res = await fetch('https://admin.egg/blog/ghost/api/canary/admin/comments/' + data.id + '/', {
+            const res = await fetch(adminUrl + 'api/canary/admin/comments/' + data.id + '/', {
                 method: 'PUT',
                 body: JSON.stringify({
                     comments: [{
@@ -52,7 +54,7 @@ window.addEventListener('message', async function (event) {
 
     if (data.action === 'showComment') {
         try {
-            const res = await fetch('https://admin.egg/blog/ghost/api/canary/admin/comments/' + data.id + '/', {
+            const res = await fetch(adminUrl + 'api/canary/admin/comments/' + data.id + '/', {
                 method: 'PUT',
                 body: JSON.stringify({
                     comments: [{