diff --git a/InvenTree/part/templatetags/inventree_extras.py b/InvenTree/part/templatetags/inventree_extras.py
index 42c66cf78e..fa739d9bd2 100644
--- a/InvenTree/part/templatetags/inventree_extras.py
+++ b/InvenTree/part/templatetags/inventree_extras.py
@@ -89,6 +89,12 @@ def inventree_in_debug_mode(*args, **kwargs):
 
     return djangosettings.DEBUG
 
+@register.simple_tag()
+def inventree_demo_mode(*args, **kwargs):
+    """ Return True if the server is running in DEMO mode """
+
+    return djangosettings.DEMO_MODE
+
 
 @register.simple_tag()
 def inventree_docker_mode(*args, **kwargs):
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 6dc0d7d78a..262a749bfa 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -86,25 +86,20 @@
             </div>
         </div>
         <main class='col ps-md-2 pt-2 pe-2'>
-
-            {% if server_restart_required %}
-            <div class='notification-area' id='restart-required'>
+            
+            {% block alerts %}
+            <div class='notification-area' id='alerts'>
+                <!-- Div for displayed alerts -->
+                {% if server_restart_required %}
                 <div id='alert-restart-server' class='alert alert-danger' role='alert'>
                     <span class='fas fa-server'></span>
                     <b>{% trans "Server Restart Required" %}</b>
                     <small>
                         <br>
-                        {% trans "A configuration option has been changed which requires a server restart" %}.
-                        <br>
-                        {% trans "Contact your system administrator for further information" %}
+                        {% trans "A configuration option has been changed which requires a server restart" %}. {% trans "Contact your system administrator for further information" %}
                     </small>
                 </div>
-            </div>
-            {% endif %}
-
-            {% block alerts %}
-            <div class='notification-area' id='alerts'>
-                <!-- Div for displayed alerts -->
+                {% endif %}
             </div>
             {% endblock %}