diff --git a/modules/Bio/EnsEMBL/Pipeline/FASTA/ReuseSpeciesFactory.pm b/modules/Bio/EnsEMBL/Pipeline/FASTA/ReuseSpeciesFactory.pm
index 203ff1d86df2d71d7ba3ece87c254a3ff9e6c051..ac530d757a51d7f7fd45c57f6b4e29314060a794 100644
--- a/modules/Bio/EnsEMBL/Pipeline/FASTA/ReuseSpeciesFactory.pm
+++ b/modules/Bio/EnsEMBL/Pipeline/FASTA/ReuseSpeciesFactory.pm
@@ -123,14 +123,14 @@ join changelog_species cs using (changelog_id)
 join species s using (species_id)
 where c.release_id = ?
 and (c.assembly = ? or c.repeat_masking = ?)
-and c.team = ?
+and c.team IN (?,?)
 and c.status = ?
-and production_name = ?
+and s.production_name = ?
 SQL
   my $production_name  = $dba->get_MetaContainer()->get_production_name();
   $dba->dbc()->disconnect_if_idle();
   my $release = $self->param('release');
-  my $params = [ $release, 'Y', 'Y', 'Genebuild', 'handed_over', $production_name ];
+  my $params = [ $release, 'Y', 'Y', 'Genebuild', 'EnsemblGenomes', 'handed_over', $production_name ];
   my $prod_dba = $self->get_production_DBAdaptor();
   my $result = $prod_dba->dbc()->sql_helper()->execute_single_result(-SQL => $sql, -PARAMS => $params);
   $prod_dba->dbc()->disconnect_if_idle();