--- a/og.module
+++ b/og.module
@@ -1419,6 +1419,12 @@ function og_query_og_membership_alter(QueryAlterableInterface $query) {
   $entity_type = is_array($entity_type) ? $entity_type[0] : $entity_type;
   $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.
+  if ($entity_type == 'taxonomy_term') {
+    $entity_info['entity keys']['bundle'] = 'vid';
+  }
 
   if ($base_table) {
     // If the table of the base entity does not exist (e.g. there is no