--- Slim/DataStores/DBI/DBIStore.pm	(revision 11054)
+++ Slim/DataStores/DBI/DBIStore.pm	(local)
@@ -1695,9 +1695,7 @@
 
 		# Bug 1143: The user has updated the genre tag, and is
 		# rescanning We need to remove the previous associations.
-		for my $genreObj ($track->genres) {
-			$genreObj->delete;
-		}
+		Slim::DataStores::DBI::GenreTrack->sql_fastDelete->execute($track->id);
 
 		Slim::DataStores::DBI::Genre->add($genre, $track);
 	}
--- Slim/DataStores/DBI/GenreTrack.pm	(revision 11054)
+++ Slim/DataStores/DBI/GenreTrack.pm	(local)
@@ -16,6 +16,8 @@
 
 	$class->has_a(genre => 'Slim::DataStores::DBI::Genre');
 	$class->has_a(track => 'Slim::DataStores::DBI::Track');
+
+	$class->set_sql('fastDelete' => 'DELETE FROM __TABLE__ WHERE track = ?');
 }
 
 1;