diff --git a/wp-includes/template-functions-category.php b/wp-includes/template-functions-category.php
index 2eec919c45..8a8b828d4b 100644
--- a/wp-includes/template-functions-category.php
+++ b/wp-includes/template-functions-category.php
@@ -272,7 +272,7 @@ function list_cats($optionall = 1, $all = 'All', $sort_column = 'ID', $sort_orde
 
         $categories = $wpdb->get_results($query);
     }
-    if (intval($hide_empty) == 1 || intval($optioncount) == 1) {
+    if (intval($hide_empty) == 1 && intval($optioncount) == 1) {
         $cat_counts = $wpdb->get_results("    SELECT cat_ID,
         COUNT($tablepost2cat.post_id) AS cat_count
         FROM $tablecategories LEFT JOIN $tablepost2cat ON (cat_ID = category_id)