diff --git a/plugins/plugins/core/q-app/q-apps.src.js b/plugins/plugins/core/q-app/q-apps.src.js
index 7f490e4a..abbe1fca 100644
--- a/plugins/plugins/core/q-app/q-apps.src.js
+++ b/plugins/plugins/core/q-app/q-apps.src.js
@@ -910,14 +910,12 @@ class QApps extends LitElement {
     }
 
     renderDownload(downObj) {
-        if (downObj.status != null) {
-            if (downObj.status.description === "Published but not yet downloaded" || downObj.status.status === "MISSING_DATA") {
-                return html`<mwc-button ?disabled="${this.btnDisabled}" dense unelevated label="${translate("appspage.schange36")}" icon="download" @click=${() => this.downloadApp(downObj)}></mwc-button>`
-            } else if (downObj.status.description === "Ready" || downObj.status.status === "DOWNLOADED") {
-                return html`<a class="visitSite" href="../qdn/browser/index.html?name=${downObj.name}&service=${this.service}"><mwc-button class="green" dense unelevated label="${translate("appspage.schange39")}" icon="open_in_browser"></mwc-button></a>`
-            }
-        } else {
+        if (downObj.status.description === "Published but not yet downloaded" || downObj.status.status === "MISSING_DATA") {
             return html`<mwc-button ?disabled="${this.btnDisabled}" dense unelevated label="${translate("appspage.schange36")}" icon="download" @click=${() => this.downloadApp(downObj)}></mwc-button>`
+        } else if (downObj.status.description === "Ready" || downObj.status.status === "DOWNLOADED") {
+            return html`<a class="visitSite" href="../qdn/browser/index.html?name=${downObj.name}&service=${this.service}"><mwc-button class="green" dense unelevated label="${translate("appspage.schange39")}" icon="open_in_browser"></mwc-button></a>`
+        } else {
+            return html``
         }
     }
 
diff --git a/plugins/plugins/core/qdn/websites.src.js b/plugins/plugins/core/qdn/websites.src.js
index 8fc8b502..0e501e2a 100644
--- a/plugins/plugins/core/qdn/websites.src.js
+++ b/plugins/plugins/core/qdn/websites.src.js
@@ -1024,17 +1024,8 @@ class Websites extends LitElement {
     }
 
     renderPublishedBy(websiteObj) {
-        if (websiteObj.status != null) {
-            return html`
-                    <div class="resourceRegisteredName">${websiteObj.name}</div>
-                    <div class="resourceStatus">${translate("websitespage.schange28")}: <span title="${websiteObj.status.description}">${websiteObj.status.title}</span></div>
-            `
-        } else {
-            return html`
-                    <div class="resourceRegisteredName">${websiteObj.name}</div>
-                    <div class="resourceStatus">${translate("websitespage.schange28")}: <span title="Published but not yet downloaded">Published</span></div>
-            `
-        }
+        return html`<div class="resourceRegisteredName">${websiteObj.name}</div>
+        <div class="resourceStatus">${translate("websitespage.schange28")}: <span title="${websiteObj.status.description}">${websiteObj.status.title}</span></div>`
     }
 
     renderSize(websiteObj) {