diff --git a/og.module b/og.module
index 6f28205..a640344 100755
--- a/og.module
+++ b/og.module
@@ -1420,6 +1420,10 @@ function og_query_og_membership_alter(QueryAlterableInterface $query) {
   $entity_info = entity_get_info($entity_type);
   $id = $entity_info['entity keys']['id'];
 
+  // To avoid condition on 'vid' being reverted to a condition on 'vocabulary_machine_name'
+  // Set entity keys bundle to 'vid', @see 'taxonomy_entity_query_alter' hook.
+  $entity_info['entity keys']['bundle'] = 'vid';
+
   if ($base_table) {
     // If the table of the base entity does not exist (e.g. there is no
     // property condition), we need to add it, as we don't have the