Index: template.php
===================================================================
--- template.php	(revision 16313)
+++ template.php	(working copy)
@@ -1608,7 +1608,7 @@
 		$post_states[] = _x('Pending', 'post state');
 	if ( is_sticky($post->ID) )
 		$post_states[] = __('Sticky');
-	if ( get_post_format( $post->ID ) )
+	if ( get_post_format( $post->ID ) && current_theme_supports( 'post-formats' ) )
 		$post_states[] = '<span>[</span>' . get_post_format_string( get_post_format( $post->ID ) ) . '<span>]</span>';
 
 	$post_states = apply_filters( 'display_post_states', $post_states );