diff --git a/data/interfaces/default/shutdown.html b/data/interfaces/default/shutdown.html
index 68f43d2c..42015679 100644
--- a/data/interfaces/default/shutdown.html
+++ b/data/interfaces/default/shutdown.html
@@ -35,19 +35,50 @@
         </div>
     </div>
 </%def>
-<%def name="javascriptIncludes()">
-    <script>
-        // Use p.countdown as container, pass redirect, duration, and optional message
-        $(".countdown").countdown(reloadPage, ${timer}, "");
-        $('#state-change-modal').modal({
-            keyboard: false
-        })
-        // Make modal visible
-        $('#state-change-modal').modal('show')
 
-        // Redirect to home page after countdown.
-        function reloadPage() {
-            window.location.href = "${new_http_root}index";
-        }
-    </script>
+<%def name="javascriptIncludes()">
+<script>
+    // Use p.countdown as container, pass redirect, duration, and optional message
+    $(".countdown").countdown(reloadPage, ${timer}, "");
+    $('#state-change-modal').modal({
+        keyboard: false
+    })
+    // Make modal visible
+    $('#state-change-modal').modal('show')
+
+    // Redirect to home page after countdown.
+    function reloadPage() {
+        window.location.href = "${new_http_root}index";
+    }
+
+    // Redirect to home page if page is available.
+    var checkOnline = setInterval(checkPageOffline, 1000);
+
+    function checkPageOffline() {
+        $.ajax({
+            type: 'HEAD',
+            url: 'index',
+            timeout: 1000,
+            error: function () {
+                % if signal != 'shutdown':
+                clearInterval(checkOnline);
+                setInterval(checkPageOnline, 1000);
+                % else:
+                reloadPage();
+                % endif
+            }
+        });
+    }
+    function checkPageOnline() {
+        $.ajax({
+            type: 'HEAD',
+            url: 'index',
+            timeout: 1000,
+            success: function () {
+                reloadPage();
+            }
+        });
+    }
+</script>
+
 </%def>
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index dfb31068..d3683b41 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -3324,7 +3324,7 @@ class WebInterface(object):
         else:
             new_http_root = '/'
 
-        return serve_template(templatename="shutdown.html", title=title,
+        return serve_template(templatename="shutdown.html", signal=signal, title=title,
                               new_http_root=new_http_root, message=message, timer=timer, quote=quote)
 
     @cherrypy.expose