diff --git a/_includes/analytics.html b/_includes/analytics.html
index 64a3359a..5448a506 100644
--- a/_includes/analytics.html
+++ b/_includes/analytics.html
@@ -1,4 +1,4 @@
-{% if site.analytics.provider and page.analytics != false %}
+{% if jekyll.environment == 'production' and site.analytics.provider and page.analytics != false %}
 
 {% case site.analytics.provider %}
 {% when "google" %}
diff --git a/_layouts/single.html b/_layouts/single.html
index 6997cf10..49d92130 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -63,7 +63,7 @@ layout: default
       {% include post_pagination.html %}
     </div>
 
-    {% if site.comments.provider and page.comments %}
+    {% if jekyll.environment == 'production' and site.comments.provider and page.comments %}
       {% include comments.html %}
     {% endif %}
   </article>