diff --git wp-includes/meta.php wp-includes/meta.php
index 22b0315..9cab5a4 100644
--- wp-includes/meta.php
+++ wp-includes/meta.php
@@ -537,6 +537,10 @@ function update_meta_cache($meta_type, $object_ids) {
 		$object_ids = explode(',', $object_ids);
 	}
 
+	$meta_cache_limit = apply_filters( 'meta_cache_limit', 1000 );
+	if ( count( $object_ids ) > $meta_cache_limit )
+		return false;
+
 	$object_ids = array_map('intval', $object_ids);
 
 	$cache_key = $meta_type . '_meta';
@@ -720,8 +724,8 @@ class WP_Meta_Query {
 				$key_only_queries[$k] = $q;
 				unset( $this->queries[$k] );
 			}
-		}		
-		
+		}
+
 		// Split out the meta_key only queries (we can only do this for OR)
 		if ( 'OR' == $this->relation ) {
 			foreach ( $this->queries as $k => $q ) {