diff --git a/dashboard/src/models/AppsModel.js b/dashboard/src/models/AppsModel.js
index de0aed985..1af1bb38c 100644
--- a/dashboard/src/models/AppsModel.js
+++ b/dashboard/src/models/AppsModel.js
@@ -113,6 +113,7 @@ function create() {
     app.ssoAuth = app.sso && (app.manifest.addons['ldap'] || app.manifest.addons['oidc'] || app.manifest.addons['proxyAuth']); // checking app.sso first ensures app.manifest.addons is not null
     app.type = app.manifest.id === PROXY_APP_ID ? APP_TYPES.PROXIED : APP_TYPES.APP;
     app.iconUrl = app.iconUrl ? `${API_ORIGIN}${app.iconUrl}?ts=${new Date(app.ts).getTime()}` : `${API_ORIGIN}/img/appicon_fallback.png`; // calculate full icon url with cache busting
+    app.origin = 'https://' + app.fqdn;
 
     // only fetch if we have permissions and a taskId is set/active
     if (!app.taskId || (app.accessLevel !== 'operator' && app.accessLevel !== 'admin')) {
@@ -137,7 +138,7 @@ function create() {
       text = text.replace(/\$CLOUDRON-APP-LOCATION/g, app.subdomain);
       text = text.replace(/\$CLOUDRON-APP-DOMAIN/g, app.domain);
       text = text.replace(/\$CLOUDRON-APP-FQDN/g, app.fqdn);
-      text = text.replace(/\$CLOUDRON-APP-ORIGIN/g, 'https://' + app.fqdn);
+      text = text.replace(/\$CLOUDRON-APP-ORIGIN/g, app.origin);
       text = text.replace(/\$CLOUDRON-API-DOMAIN/g, config.adminFqdn);
       text = text.replace(/\$CLOUDRON-API-ORIGIN/g, 'https://' + config.adminFqdn);
       text = text.replace(/\$CLOUDRON-USERNAME/g, profile.username);
diff --git a/dashboard/src/views/AppsView.vue b/dashboard/src/views/AppsView.vue
index 28e65f8be..ba3d1e07b 100644
--- a/dashboard/src/views/AppsView.vue
+++ b/dashboard/src/views/AppsView.vue
@@ -241,7 +241,8 @@ async function refreshApps() {
   // amend properties to mimick full app
   for (const applink of applinks) {
     applink.type = APP_TYPES.LINK;
-    applink.fqdn = applink.upstreamUri.replace('https://', '');
+    applink.origin = applink.upstreamUri;
+    applink.fqdn = applink.upstreamUri;
     applink.manifest = { addons: {}};
     applink.installationState = ISTATES.INSTALLED;
     applink.runState = RSTATES.RUNNING;
@@ -339,7 +340,7 @@ onDeactivated(() => {
       </div>
 
       <TransitionGroup name="grid-animation" tag="div" class="grid" v-if="viewType === VIEW_TYPE.GRID">
-        <a v-for="app in filteredApps" :key="app.id" class="grid-item" :class="{ 'item-inactive': app.runState === RSTATES.STOPPED }" @click="onOpenApp(app, $event)" :href="'https://' + app.fqdn" target="_blank" :style="{ width: itemWidth }">
+        <a v-for="app in filteredApps" :key="app.id" class="grid-item" :class="{ 'item-inactive': app.runState === RSTATES.STOPPED }" @click="onOpenApp(app, $event)" :href="app.origin" target="_blank" :style="{ width: itemWidth }">
           <img :alt="app.label || app.subdomain || app.fqdn" :src="app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'"/>
           <div class="grid-item-label" v-fit-text>{{ app.label || app.subdomain || app.fqdn }}</div>
           <div class="grid-item-task-label" v-if="app.type === APP_TYPES.LINK">{{ $t('app.appLink.title') }}</div>
@@ -359,12 +360,12 @@ onDeactivated(() => {
 
         <TableView :columns="listColumns" :model="filteredApps">
           <template #icon="app">
-            <a :href="'https://' + app.fqdn" target="_blank">
+            <a :href="app.origin" target="_blank">
               <img :alt="app.label || app.subdomain || app.fqdn" class="list-icon" :class="{ 'item-inactive': app.runState === RSTATES.STOPPED }" :src="app.iconUrl" v-fallback-image="API_ORIGIN + '/img/appicon_fallback.png'"/>
             </a>
           </template>
           <template #label="app">
-            <a :href="'https://' + app.fqdn" target="_blank">
+            <a :href="app.origin" target="_blank">
               {{ app.label || app.subdomain || app.fqdn }}
             </a>
           </template>
@@ -372,7 +373,7 @@ onDeactivated(() => {
             {{ app.manifest.title }}
           </template>
           <template #fqdn="app">
-            <a :href="'https://' + app.fqdn" target="_blank">
+            <a :href="app.origin" target="_blank">
               {{ app.fqdn }}
             </a>
           </template>