diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
index e8bae6a540..21917011c8 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/devices.hbs
@@ -107,7 +107,7 @@
                 <th data-for="By Ownership" class="select-filter"></th>
                 <th class="no-sort"></th>
             </tr>
-            <tr class="bulk-action-row">
+            <tr class="bulk-action-row hidden">
                 <th colspan="7">
                     <div id="operation-bar">
                         {{unit "mdm.unit.device.operation-bar"}}
@@ -136,6 +136,26 @@
             <a href="#">By Ownership</a>
         </div>
     </div>
+    <div id="no-device-view" class="ast-container list-view hidden">
+        <div class="ctrl-info-panel col-centered text-center wr-login">
+            <h2>You don't have any device registered at the moment.</h2>
+            <br/>
+            <p class="text-center">
+                <a href="javascript:toggleEnrollment()" class="wr-btn">
+                                <span class="fw-stack">
+                                   <i class="fw fw-ring fw-stack-2x"></i>
+                                   <i class="fw fw-mobile fw-stack-1x"></i>
+                                   <span class="fw-stack fw-move-right fw-move-bottom">
+                                      <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"></i>
+                                       <i class="fw fw-circle fw-stack-2x"></i>
+                                      <i class="fw fw-add fw-stack-1x"></i>
+                                   </span>
+                                </span>
+                    Enroll New Device
+                </a>
+            </p>
+        </div>
+    </div>
 {{/zone}}
 
 {{#zone "bottomJs"}}
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
index 423cdbd15a..da5d4182c2 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.devices/public/js/device-listing.js
@@ -451,8 +451,7 @@ function initPage() {
                 } else {
                     $("#loading-content").remove();
                     $("#device-table").remove();
-                    $("#device-listing-status-msg").text("No enrolled device is found.");
-                    $("#device-listing-status").removeClass(' hidden');
+                    $("#no-device-view").removeClass(' hidden');
                 }
             }
         }, function (message) {