diff --git a/dashboard/src/meta-tags-header.html b/dashboard/src/meta-tags-header.html
index 6e2418b91..c43c295a3 100644
--- a/dashboard/src/meta-tags-header.html
+++ b/dashboard/src/meta-tags-header.html
@@ -7,6 +7,10 @@
     <link rel="icon" href="<%- iconUrl %>?<%- Date.now() %>" type="image/png">
     <link rel="apple-touch-icon" href="<%- iconUrl %>?<%- Date.now() %>" type="image/png">
     <meta property="og:image" content="<%- iconUrl %>?<%- Date.now() %>">
+<% } else if (locals.dashboardFqdn) { -%>
+    <link rel="icon" href="https://<%- dashboardFqdn %>/api/v1/cloudron/avatar?<%- Date.now() %>" type="image/png">
+    <link rel="apple-touch-icon" href="https://<%- dashboardFqdn %>/api/v1/cloudron/avatar?<%- Date.now() %>" type="image/png">
+    <meta property="og:image" content="https://<%- dashboardFqdn %>/api/v1/cloudron/avatar?<%- Date.now() %>">
 <% } else { -%>
     <link rel="icon" href="/api/v1/cloudron/avatar?<%- Date.now() %>" type="image/png">
     <link rel="apple-touch-icon" href="/api/v1/cloudron/avatar?<%- Date.now() %>" type="image/png">
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index e3543532c..64eb89a2f 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -67,8 +67,9 @@ const TEMPLATE_RESTORE = fs.readFileSync(path.join(paths.DASHBOARD_DIR, 'restore
 const TEMPLATE_ACTIVATION = fs.readFileSync(path.join(paths.DASHBOARD_DIR, 'activation.html'), 'utf-8');
 
 async function renderIndex(req, res) {
+    const { fqdn:dashboardFqdn } = await dashboard.getLocation();
     const name = await branding.getCloudronName();
-    const html = ejs.render(TEMPLATE_INDEX, { name });
+    const html = ejs.render(TEMPLATE_INDEX, { dashboardFqdn, name });
 
     res.send(html);
 }