diff --git a/src/wp-content/themes/twentythirteen/content.php b/src/wp-content/themes/twentythirteen/content.php
index d11e682abc..c341740438 100644
--- a/src/wp-content/themes/twentythirteen/content.php
+++ b/src/wp-content/themes/twentythirteen/content.php
@@ -12,7 +12,7 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<?php if ( has_post_thumbnail() && ! post_password_required() ) : ?>
+		<?php if ( has_post_thumbnail() && ! post_password_required() && ! is_attachment() ) : ?>
 		<div class="entry-thumbnail">
 			<?php the_post_thumbnail(); ?>
 		</div>
diff --git a/src/wp-content/themes/twentytwelve/content.php b/src/wp-content/themes/twentytwelve/content.php
index daaad3447d..56493ed0bd 100644
--- a/src/wp-content/themes/twentytwelve/content.php
+++ b/src/wp-content/themes/twentytwelve/content.php
@@ -17,7 +17,10 @@
 		</div>
 		<?php endif; ?>
 		<header class="entry-header">
-			<?php the_post_thumbnail(); ?>
+			<?php if ( ! post_password_required() && ! is_attachment() ) :
+				the_post_thumbnail();
+			endif; ?>
+
 			<?php if ( is_single() ) : ?>
 			<h1 class="entry-title"><?php the_title(); ?></h1>
 			<?php else : ?>