diff --git a/image.php b/image.php
index 342922b6..919c042f 100644
--- a/image.php
+++ b/image.php
@@ -109,7 +109,11 @@ get_header();
 					</footer><!-- .entry-meta -->
 				</article><!-- #post-<?php the_ID(); ?> -->
 
-				<?php comments_template(); ?>
+				<?php
+					// If comments are open or we have at least one comment, load up the comment template
+					if ( comments_open() || '0' != get_comments_number() )
+						comments_template( '', true );
+				?>
 
 			<?php endwhile; // end of the loop. ?>
 
diff --git a/page.php b/page.php
index c5c1ef30..7cb688f3 100644
--- a/page.php
+++ b/page.php
@@ -20,7 +20,11 @@ get_header(); ?>
 
 					<?php get_template_part( 'content', 'page' ); ?>
 
-					<?php comments_template( '', true ); ?>
+          <?php
+            // If comments are open or we have at least one comment, load up the comment template
+            if ( comments_open() || '0' != get_comments_number() )
+              comments_template( '', true );
+          ?>
 
 				<?php endwhile; // end of the loop. ?>