diff --git a/webadmin/src/views/apps.html b/webadmin/src/views/apps.html
index e1591b256..3c404b7e5 100644
--- a/webadmin/src/views/apps.html
+++ b/webadmin/src/views/apps.html
@@ -50,8 +50,8 @@
 
                         <br/>
 
-                        <label class="control-label" for="appConfigureCertificateInput">Certificate (optional)</label>
-                        <div class="has-error text-center" ng-show="appConfigure.error.cert">{{ appConfigure.error.cert }}</div>
+                        <label class="control-label" for="appConfigureCertificateInput" ng-show="config.isCustomDomain">Certificate (optional)</label>
+                        <div class="has-error text-center" ng-show="appConfigure.error.cert && config.isCustomDomain">{{ appConfigure.error.cert }}</div>
                         <div class="form-group" ng-class="{ 'has-error': !appConfigureForm.certificate.$dirty && appConfigure.error.cert }" ng-show="config.isCustomDomain">
                             <div class="input-group">
                                 <input type="file" id="appConfigureCertificateFileInput" style="display:none"/>
diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index 553fdbdec..5fa7195a1 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -44,8 +44,8 @@
 
                         <br/>
 
-                        <label class="control-label" for="appInstallCertificateInput">Certificate (optional)</label>
-                        <div class="has-error text-center" ng-show="appInstall.error.cert">{{ appInstall.error.cert }}</div>
+                        <label class="control-label" for="appInstallCertificateInput" ng-show="config.isCustomDomain">Certificate (optional)</label>
+                        <div class="has-error text-center" ng-show="appInstall.error.cert && config.isCustomDomain">{{ appInstall.error.cert }}</div>
                         <div class="form-group" ng-class="{ 'has-error': !appInstallForm.certificate.$dirty && appInstall.error.cert }" ng-show="config.isCustomDomain">
                             <div class="input-group">
                                 <input type="file" id="appInstallCertificateFileInput" style="display:none"/>