diff --git a/_layouts/docs.html b/_layouts/docs.html
index 308d4f1fa2..fc96b44c36 100644
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -89,11 +89,13 @@ else %}{% assign edit_url = "" %}{% endif %} {% break %} {% endif %} {% endfor %
 							<h1>{{ page.title }}</h1>{% endif %} {% if page.advisory %}
 							<blockquote>{{ site.data.advisories.texts[page.advisory] | markdownify }}</blockquote>{% endif %}{% endif %} {% unless page.tree == false %}{% include read_time.html %}{% endunless %}{{ content }}
 							<!-- tags -->
+							{% unless page.notags == true %}
 							{% assign keywords = page.keywords | split:"," %}
 							{% for keyword in keywords %}{% assign strippedKeyword = keyword | strip %}
 							{% capture keywordlist %}{{ keywordlist }}<a href="/glossary/?term={{strippedKeyword}}">{{strippedKeyword}}</a>{% unless forloop.last %}, {% endunless %}{% endcapture %}
 							{% endfor %}
 							{% if keywordlist.size > 0 %}<span class="glyphicon glyphicon-tags" style="padding-right: 10px"></span><span style="vertical-align: 2px">{{ keywordlist }}</span>{% endif %}
+							{% endif %}
 							<!-- link corrections -->
               <script language="JavaScript">
 							var x = document.links.length;