diff --git a/wp-includes/post.php b/wp-includes/post.php
index b94916dc2..0acf6414e 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -487,6 +487,9 @@ function get_post_mime_type($ID = '') {
 function get_post_format( $post = null ) {
 	$post = get_post($post);
 
+	if ( ! post_type_supports( $post->post_type, 'post-formats' ) )
+		return false;
+
 	$_format = get_the_terms( $post->ID, 'post_format' );
 
 	if ( empty( $_format ) )