diff --git a/wp-includes/category.php b/wp-includes/category.php
index 30392a7594..1ea9b9d536 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -70,9 +70,9 @@ function &get_categories($args = '') {
 	$having = '';
 	if ( $hide_empty ) {
 		if ( 'link' == $type )
-			$having = 'HAVING link_count > 0';
+			$where .= ' AND link_count > 0';
 		else
-			$having = 'HAVING category_count > 0';
+			$where .= ' AND category_count > 0';
 	}
 
 	if ( !empty($number) )
@@ -80,7 +80,7 @@ function &get_categories($args = '') {
 	else
 		$number = '';
 
-	$categories = $wpdb->get_results("SELECT * FROM $wpdb->categories WHERE $where $having ORDER BY $orderby $order $number");
+	$categories = $wpdb->get_results("SELECT * FROM $wpdb->categories WHERE $where ORDER BY $orderby $order $number");
 
 	if ( empty($categories) )
 		return array();