diff --git a/ietf/templates/doc/disclaimer.html b/ietf/templates/doc/disclaimer.html
index ed25b4d923..6743856db1 100644
--- a/ietf/templates/doc/disclaimer.html
+++ b/ietf/templates/doc/disclaimer.html
@@ -2,8 +2,8 @@
 {% load origin %}
 {% load ietf_filters %}
 {% origin %}
-{% if doc.type_id == "rfc"%}
-    {% if doc.stream.slug != "ietf" and not doc.std_level or doc.std_level.slug in "exp,inf"|split:","%}
+{% if doc.type_id == "rfc" %}{{doc.std_level.slug}}{{doc.stream.slug}}
+    {% if doc.stream.slug != "ietf" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %}
         <div class="alert alert-warning {% if document_html %}small p-2 mt-2{% endif %}" role="alert">
             This RFC was published on the {{ doc.stream.desc }} stream.
             This RFC is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
@@ -11,7 +11,7 @@
         </div>
     {% endif %}
 {% elif doc|is_in_stream %}
-    {% if doc.stream.slug != "ietf" and not doc.std_level or doc.std_level.slug in "exp,inf"|split:","%}
+    {% if doc.stream.slug != "ietf" and doc.std_level.slug|default:"unk" not in "bcp,ds,ps,std"|split:"," %}
         <div class="alert alert-warning {% if document_html %}small p-2 mt-2{% endif %}" role="alert">
             This document is an Internet-Draft (I-D) intended for RFC publication on the {{ doc.stream.desc }} stream.
             This I-D is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
@@ -24,6 +24,5 @@
         <a href="{% url 'ietf.doc.views_doc.document_main' name='draft-wkumari-not-a-draft' %}">Anyone may submit an I-D to the IETF.</a>
         This I-D is <strong>not endorsed by the IETF</strong> and has <strong>no formal standing</strong> in the
         <a href="{% url 'ietf.doc.views_doc.document_main' name='rfc2026' %}">IETF standards process</a>.
-
     </div>
 {% endif %}
\ No newline at end of file