diff --git a/_layouts/single.html b/_layouts/single.html
index 1e42e3f6b8a4..21cd71144b56 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -65,8 +65,15 @@ <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4
       {% include post_pagination.html %}
     </div>
 
-    {% if jekyll.environment == 'production' and site.comments.provider and page.comments %}
-      {% include comments.html %}
+    {% if site.comments.provider and page.comments %}
+      {% if jekyll.environment == 'production' %}
+        {% include comments.html %}
+      {% else %}
+        <p>
+          Comments are configured with provider: <strong>{{ site.comments.provider }}</strong>,
+          but are disabled in non-production environments.
+        </p>
+      {% endif %}
     {% endif %}
   </article>