diff --git src/wp-includes/template.php src/wp-includes/template.php
index 4205ce9..68db601 100644
--- src/wp-includes/template.php
+++ src/wp-includes/template.php
@@ -498,6 +498,10 @@ function get_single_template() {
 		$templates[] = "single-{$object->post_type}.php";
 	}
 
+	if( is_attachment() ) {
+		$templates[] = "attachment.php";
+	}
+
 	$templates[] = "single.php";
 
 	return get_query_template( 'single', $templates );
@@ -608,7 +612,10 @@ function get_attachment_template() {
 		}
 		$templates[] = "{$type}.php";
 	}
-	$templates[] = 'attachment.php';
+
+	if( ! is_single() ) {
+		$templates[] = 'attachment.php';
+	}
 
 	return get_query_template( 'attachment', $templates );
 }