diff --git a/gstlal-inspiral/share/inj_snr_simplify_and_cluster.sql b/gstlal-inspiral/share/inj_snr_simplify_and_cluster.sql
index db58f274c44a247180c1d2285e3e794136e42cdb..2080df751cdab80e07d35781d2230d726d56a539 100644
--- a/gstlal-inspiral/share/inj_snr_simplify_and_cluster.sql
+++ b/gstlal-inspiral/share/inj_snr_simplify_and_cluster.sql
@@ -174,6 +174,9 @@ FROM
 -- create a look-up table of info required for clustering
 --
 
+CREATE INDEX tmpindex1 ON coinc_event_map (coinc_event_id);
+CREATE INDEX tmpindex2 ON coinc_event (coinc_event_id);
+
 CREATE TEMPORARY TABLE _cluster_info_ AS
 	SELECT
 		coinc_event.coinc_event_id AS coinc_event_id,
@@ -187,6 +190,9 @@ CREATE TEMPORARY TABLE _cluster_info_ AS
 		JOIN coinc_inspiral ON (
 			coinc_inspiral.coinc_event_id == coinc_event.coinc_event_id
 		);
+DROP INDEX tmpindex1;
+DROP INDEX tmpindex2;
+
 CREATE INDEX tmpindex1 ON _cluster_info_ (coinc_event_id);
 CREATE INDEX tmpindex2 ON _cluster_info_ (category, end_time, ranking_stat);