diff --git a/src/main/resources/templates/fragments/demoBanner.html b/src/main/resources/templates/fragments/demoBanner.html
new file mode 100644
index 000000000..efacee975
--- /dev/null
+++ b/src/main/resources/templates/fragments/demoBanner.html
@@ -0,0 +1,5 @@
+<div th:fragment="demoBanner"
+     th:if="${demoProfile}"
+     class="demo-banner"
+     th:utext="${demoText}">
+</div>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/toolbar.html b/src/main/resources/templates/fragments/toolbar.html
index 2cbd99f96..7effeae41 100644
--- a/src/main/resources/templates/fragments/toolbar.html
+++ b/src/main/resources/templates/fragments/toolbar.html
@@ -30,5 +30,5 @@
       <th:block th:replace="~{fragments/localeSelect :: translate_noscript}"></th:block>
     </div>
   </header>
-  <th:block th:replace="~{fragments/demoBanner :: demoBanner(demoText=#{demo.banner-text}, profile='demo')}"/>
+  <th:block th:replace="~{fragments/demoBanner :: demoBanner(demoText=#{demo.banner-text}, demoProfile=${@environment.getProperty('demo')})}"/>
 </th:block>