Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php	(revision 18519)
+++ wp-includes/post.php	(working copy)
@@ -2726,12 +2726,6 @@
 	$post->post_status = 'publish';
 	wp_transition_post_status('publish', $old_status, $post);
 
-	// Update counts for the post's terms.
-	foreach ( (array) get_object_taxonomies('post') as $taxonomy ) {
-		$tt_ids = wp_get_object_terms($post_id, $taxonomy, array('fields' => 'tt_ids'));
-		wp_update_term_count($tt_ids, $taxonomy);
-	}
-
 	do_action('edit_post', $post_id, $post);
 	do_action('save_post', $post_id, $post);
 	do_action('wp_insert_post', $post_id, $post);
@@ -2969,6 +2963,16 @@
  * @param object $post Post data.
  */
 function wp_transition_post_status($new_status, $old_status, $post) {
+
+        // Update counts for the post's terms.
+        foreach ( (array) get_object_taxonomies( $post->post_type ) as $taxonomy ) {
+		if( empty( get_taxonomy( $taxonomy )->update_count_callback ) )
+			continue;
+
+                $tt_ids = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'tt_ids ') );
+                wp_update_term_count( $tt_ids, $taxonomy );
+        }
+
 	do_action('transition_post_status', $new_status, $old_status, $post);
 	do_action("{$old_status}_to_{$new_status}", $post);
 	do_action("{$new_status}_{$post->post_type}", $post->ID, $post);