diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index e914822ec7..02a35e18a3 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -39,7 +39,9 @@
                         <div id="pendingInstallations">
                         </div>
                         <p>Please restart the server to finish applying updates.</p>
-                        <button type="button" data-icon="refresh" data-theme="b" onclick="Dashboard.restartServer();">Restart Now</button>
+                        <div class="btnRestartContainer hide">
+                            <button type="button" data-icon="refresh" data-theme="b" onclick="Dashboard.restartServer();">Restart Now</button>
+                        </div>
                     </div>
 
                     <div data-role="collapsible" data-content-theme="c" data-collapsed="false" style="margin-top: 2em;">
@@ -59,7 +61,9 @@
 
                     <div style="margin-top: 2em;">
                         <div style="display: inline-block;">
-                            <button id="btnRestartServer" type="button" data-icon="refresh" data-mini="true" data-inline="true" onclick="DashboardPage.restart();">Restart MB Server</button>
+                            <div class="btnRestartContainer hide">
+                                <button id="btnRestartServer" type="button" data-icon="refresh" data-mini="true" data-inline="true" onclick="DashboardPage.restart();">Restart MB Server</button>
+                            </div>
                         </div>
                         <div style="display: inline-block;">
                             <button id="btnShutdown" type="button" data-icon="delete" data-mini="true" data-inline="true" onclick="DashboardPage.shutdown();">Shutdown MB Server</button>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index d5705a6c43..004465f246 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -344,6 +344,12 @@
         } else {
             $('#btnUpdateApplication', page).button('enable');
         }
+        
+        if (dashboardInfo.SystemInfo.CanSelfRestart) {
+            $('.btnRestartContainer', page).removeClass('hide');
+        } else {
+            $('.btnRestartContainer', page).addClass('hide');
+        }
 
         DashboardPage.renderApplicationUpdateInfo(dashboardInfo);
         DashboardPage.renderPluginUpdateInfo(dashboardInfo);
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 624ac77642..05b0483d76 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -158,7 +158,7 @@ var Dashboard = {
             Dashboard.getCurrentUser().done(function (currentUser) {
 
                 if (currentUser.Configuration.IsAdministrator) {
-                    Dashboard.showServerRestartWarning();
+                    Dashboard.showServerRestartWarning(info);
                 }
             });
 
@@ -252,10 +252,13 @@ var Dashboard = {
 
     },
 
-    showServerRestartWarning: function () {
+    showServerRestartWarning: function (systemInfo) {
 
         var html = '<span style="margin-right: 1em;">Please restart Media Browser Server to finish updating.</span>';
-        html += '<button type="button" data-icon="refresh" onclick="$(this).button(\'disable\');Dashboard.restartServer();" data-theme="b" data-inline="true" data-mini="true">Restart Server</button>';
+        
+        if (systemInfo.CanSelfRestart) {
+            html += '<button type="button" data-icon="refresh" onclick="$(this).button(\'disable\');Dashboard.restartServer();" data-theme="b" data-inline="true" data-mini="true">Restart Server</button>';
+        }
 
         Dashboard.showFooterNotification({ id: "serverRestartWarning", html: html, forceShow: true, allowHide: false });
     },