diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/pages/asset.jag b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/pages/asset.jag
index 3460bb58e..feced0d62 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/pages/asset.jag
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/pages/asset.jag
@@ -91,9 +91,15 @@ require('/modules/store.js').exec(function (ctx) {
     var rxtAttributes = utility.getRXTAttributes(tenantId, type);
 
     var devices = [];
-        if(user != null && isNotCatalog && isDeviceSubscriptionEnabled){
-                devices =  parse(String(devicesClass.getDevicesList(stringify(user), user.tenantId, "user", [user.username], asset.attributes.overview_platform)));
-        }
+    var isDeviceAvailable = false;
+
+    if (user != null && isNotCatalog && isDeviceSubscriptionEnabled) {
+        devices = parse(String(devicesClass.getDevicesList(stringify(user), user.tenantId, "user", [user.username],
+          asset.attributes.overview_platform)));
+      if (devices.length > 0) {
+        isDeviceAvailable = true;
+      }
+    }
 
     var headerData = site.header(tenantId, {
         sso: sso,
@@ -119,6 +125,7 @@ require('/modules/store.js').exec(function (ctx) {
         user: user,
         sso: sso,
         devices: devices,
+        isDeviceAvailable : isDeviceAvailable,
         isEnterpriseInstallEnabled: isEnterpriseInstallEnabled,
         isDeviceSubscriptionEnabled : isDeviceSubscriptionEnabled,
         isDirectDownloadEnabled :isDirectDownloadEnabled,
diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/partials/page-content-app-details.hbs b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/partials/page-content-app-details.hbs
index 6ae910bca..d6176234c 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/partials/page-content-app-details.hbs
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/partials/page-content-app-details.hbs
@@ -43,51 +43,68 @@
                     {{!--buttons --}}
                     <div class="actions">
                         {{#if user}}
-                            {{#if inDashboard}}
-                                {{#if isDeviceSubscriptionEnabled}}
-                                    <a id="btn-add-gadget" href="#" data-app="{{asset.id}}"
-                                       data-platform="{{asset.attributes.overview_platform}}" data-toggle="modal"
-                                       data-target="#modalInstallApp"
-                                       class="btn btn-default"><i class="fw fw-refresh"></i>Re-Install</a>
+                            {{#if isDeviceAvailable}}
+                                {{#if inDashboard}}
+                                    {{#if isDeviceSubscriptionEnabled}}
+                                        <a id="btn-add-gadget" href="#" data-app="{{asset.id}}"
+                                           data-platform="{{asset.attributes.overview_platform}}" data-toggle="modal"
+                                           data-target="#modalInstallApp"
+                                           class="btn btn-default"><i class="fw fw-refresh"></i>Re-Install</a>
+                                    {{else}}
+                                        <a id="btn-add-gadget-install" href="#" data-app="{{asset.id}}"
+                                           data-platform="{{asset.attributes.overview_platform}}"
+                                           class="btn btn-default"><i class="fw fw-refresh"></i>Re-Install</a>
+                                    {{/if}}
+                                {{!--Check if already subscribed to previous version of the app--}}
+                                {{else}} {{#if isUpdatedApp}}
+                                    {{#if isDeviceSubscriptionEnabled}}
+                                        <a id="btn-add-gadget-update" href="#" data-app="{{asset.id}}"
+                                           data-platform="{{asset.attributes.overview_platform}}" data-toggle="modal"
+                                           data-target="#modalUpdateApp"
+                                           class="btn btn-default"><i class="fw fw-refresh"></i>Update</a>
+                                    {{else}}
+                                        <a id="btn-add-gadget-install" href="#" data-app="{{asset.id}}"
+                                           data-platform="{{asset.attributes.overview_platform}}"
+                                           class="btn btn-default"><i class="fw fw-refresh"></i>Update</a>
+                                    {{/if}}
                                 {{else}}
-                                    <a id="btn-add-gadget-install" href="#" data-app="{{asset.id}}"
-                                       data-platform="{{asset.attributes.overview_platform}}"
-                                       class="btn btn-default"><i class="fw fw-refresh"></i>Re-Install</a>
-                                {{/if}}
-                            {{!--Check if already subscribed to previous version of the app--}}
-                            {{else}} {{#if isUpdatedApp}}
-                                {{#if isDeviceSubscriptionEnabled}}
-                                    <a id="btn-add-gadget-update" href="#" data-app="{{asset.id}}"
-                                       data-platform="{{asset.attributes.overview_platform}}" data-toggle="modal"
-                                       data-target="#modalUpdateApp"
-                                       class="btn btn-default"><i class="fw fw-refresh"></i>Update</a>
+                                    {{#if isDeviceSubscriptionEnabled}}
+                                        <a id="btn-add-gadget" href="#" data-app="{{asset.id}}"
+                                           data-platform="{{asset.attributes.overview_platform}}" data-toggle="modal"
+                                           data-target="#modalInstallApp"
+                                           class="btn btn-subscribe"> <i class="fw fw-mobile"></i>Install</a>
+                                    {{else}}
+                                        <a id="btn-add-gadget-install" href="#" data-app="{{asset.id}}"
+                                           data-platform="{{asset.attributes.overview_platform}}"
+                                           class="btn btn-subscribe"> <i class="fw fw-mobile"></i>Install</a>
+                                    {{/if}}
+                                {{/if}}{{/if}}
+                                {{#if isEnterpriseInstallEnabled}}
+                                    <a href="#" id="btn-ent-install" data-aid="{{asset.id}}" data-toggle="modal"
+                                       data-target="#modalEnterpriseInstall"
+                                       class="btn btn-subscribe"><i class="fw fw-enterprise"></i>Ent. Install</a>
+                                    <input id="isEnterpriseInstallEnabledisEnterpriseInstallEnabled" type="hidden" value="true">
                                 {{else}}
-                                    <a id="btn-add-gadget-install" href="#" data-app="{{asset.id}}"
-                                       data-platform="{{asset.attributes.overview_platform}}"
-                                       class="btn btn-default"><i class="fw fw-refresh"></i>Update</a>
                                 {{/if}}
                             {{else}}
-                                {{#if isDeviceSubscriptionEnabled}}
-                                    <a id="btn-add-gadget" href="#" data-app="{{asset.id}}"
-                                       data-platform="{{asset.attributes.overview_platform}}" data-toggle="modal"
-                                       data-target="#modalInstallApp"
-                                       class="btn btn-subscribe"> <i class="fw fw-mobile"></i>Install</a>
-                                {{else}}
-                                    <a id="btn-add-gadget-install" href="#" data-app="{{asset.id}}"
-                                       data-platform="{{asset.attributes.overview_platform}}"
-                                       class="btn btn-subscribe"> <i class="fw fw-mobile"></i>Install</a>
-                                {{/if}}
-                            {{/if}}{{/if}}
+                                <a id="btn-add-gadget-install" href="#" class="btn btn-subscribe disabled">
+                                    <i class="fw fw-mobile"></i>
+                                    Install
+                                </a>
+                                <a href="#" id="btn-ent-install" class="btn btn-subscribe disabled">
+                                    <i class="fw fw-enterprise"></i>
+                                    Ent. Install
+                                </a>
+                            {{/if}}
                         {{else}}
-                            <a id="btn-add-gadget-install" href="{{tenantedUrl "/login"}}"
-                               class="btn btn-subscribe"> <i class="fw fw-mobile"></i>Install</a>
-                        {{/if}}
-
-                        {{#if isEnterpriseInstallEnabled}}
-                            <a href="#" id="btn-ent-install" data-aid="{{asset.id}}" data-toggle="modal"
-                               data-target="#modalEnterpriseInstall"
-                               class="btn btn-subscribe"><i class="fw fw-enterprise"></i>Ent. Install</a>
-                            <input id="isEnterpriseInstallEnabled" type="hidden" value="true">
+                            <a id="btn-add-gadget-install" href="#" class="btn btn-subscribe disabled">
+                                <i class="fw fw-mobile"></i>
+                                Install
+                            </a>
+                            <a href="#" id="btn-ent-install" class="btn btn-subscribe disabled">
+                                <i class="fw fw-enterprise"></i>
+                                Ent. Install
+                            </a>
                         {{/if}}
                     </div>
                 </div>
diff --git a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/renderers/extensions/assets/mobileapp/pages/asset.js b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/renderers/extensions/assets/mobileapp/pages/asset.js
index 0f3427347..1863b901f 100644
--- a/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/renderers/extensions/assets/mobileapp/pages/asset.js
+++ b/features/org.wso2.carbon.appmgt.store.feature/src/main/resources/store/extensions/assets/mobileapp/themes/store/renderers/extensions/assets/mobileapp/pages/asset.js
@@ -67,6 +67,7 @@ var render = function(theme, data, meta, require) {
                                                                            type: data.type,
                                                                            inDashboard: data.inDashboard,
                                                                            isUpdatedApp: data.isUpdatedApp,
+                                                                           isDeviceAvailable: data.isDeviceAvailable,
                                                                            isEnterpriseInstallEnabled: data.isEnterpriseInstallEnabled,
                                                                            isDeviceSubscriptionEnabled: data.isDeviceSubscriptionEnabled,
                                                                            isDirectDownloadEnabled: data.isDirectDownloadEnabled,