diff --git a/e107_core/shortcodes/batch/page_shortcodes.php b/e107_core/shortcodes/batch/page_shortcodes.php
index ed758e6086..c10c6434ef 100644
--- a/e107_core/shortcodes/batch/page_shortcodes.php
+++ b/e107_core/shortcodes/batch/page_shortcodes.php
@@ -188,7 +188,7 @@ function cpagecomments()
 
 		if(e107::getPref('comments_disabled') == 0 && !$comflag)
 		{
-			if(ADMIN)
+			if(ADMIN && deftrue('e_DEBUG'))
 			{
 				if(defined('BOOTSTRAP') && BOOTSTRAP)
 				{
diff --git a/e107_plugins/news/news.php b/e107_plugins/news/news.php
index fcb78c1492..21fb060c69 100644
--- a/e107_plugins/news/news.php
+++ b/e107_plugins/news/news.php
@@ -1317,7 +1317,7 @@ private function renderComments($news)
 			// Only show message if global comments are enabled, but current news item comments are disabled
 			if(e107::getPref('comments_disabled') == 0 && $news['news_allow_comments'] == 1)
 			{
-				if(ADMIN)
+				if(ADMIN && deftrue('e_DEBUG'))
 				{
 					if(defined('BOOTSTRAP') && BOOTSTRAP)
 					{