diff --git a/wp-includes/category.php b/wp-includes/category.php
index 2ba3d30be9..d7763741f5 100644
--- a/wp-includes/category.php
+++ b/wp-includes/category.php
@@ -77,8 +77,12 @@ function &get_categories($args = '') {
 			$where .= ' AND link_count > 0';
 		else
 			$where .= ' AND category_count > 0';
+	} else {
+		$where .= ' AND ( tag_count = 0 OR ( tag_count != 0 AND ( link_count > 0 OR category_count > 0 ) ) ) ';
 	}
 
+	
+
 	if ( !empty($number) )
 		$number = 'LIMIT ' . $number;
 	else