diff --git a/gstlal-inspiral/python/config/inspiral.py b/gstlal-inspiral/python/config/inspiral.py
index ffa7734e86d814808aef9441a4b4e255edaae712..821bc1f12a3b1b69304beb3a20883b35dbcdde38 100644
--- a/gstlal-inspiral/python/config/inspiral.py
+++ b/gstlal-inspiral/python/config/inspiral.py
@@ -107,9 +107,13 @@ class Config(BaseConfig):
 			if self.snr_optimizer and not self.snr_optimizer.source.inj_shared_memory_dir:
 				print('WARNING: no snr_optimizer inj-shared-memory-dir specified in config, defaulting to use snr_optimizer shared-memory-dir.', file=sys.stderr)
 				self.snr_optimizer.source.inj_shared_memory_dir = self.snr_optimizer.source.shared_memory_dir
-			if self.upload.enable_injection_uploads and not self.upload.inj_gracedb_service_url:
-				print('WARNING: enable-injection-uploads set and no inj-gracedb-service-url given, defaulting to use gracedb-service-url for injections.', file=sys.stderr)
-				self.upload.inj_gracedb_service_url = self.upload.gracedb_service_url
+			if self.upload.enable_injection_uploads:
+				if not self.upload.inj_gracedb_service_url:
+					print('WARNING: enable-injection-uploads set and no inj-gracedb-service-url given, defaulting to use gracedb-service-url for injections.', file=sys.stderr)
+					self.upload.inj_gracedb_service_url = self.upload.gracedb_service_url
+				if not self.upload.inj_gracedb_search:
+					print('WARNING: no inj-gracedb-search given, defaulting to use gracedb-search for injections.', file=sys.stderr)
+					self.upload.inj_gracedb_search = self.upload.gracedb_search
 		else:
 			if self.upload.enable_injection_uploads:
 				raise ValueError('Cannot provide config.upload.enable_injection_uploads when config.filter.injections is not set.')
diff --git a/gstlal-inspiral/python/dags/layers/inspiral.py b/gstlal-inspiral/python/dags/layers/inspiral.py
index af5b01d59845e25905bae86427b6c4d53cf4a875..a58192d5d73876c8dec4c55870a1398ffd36fcac 100644
--- a/gstlal-inspiral/python/dags/layers/inspiral.py
+++ b/gstlal-inspiral/python/dags/layers/inspiral.py
@@ -1814,7 +1814,7 @@ def filter_injections_online_layer(config, dag, svd_bank_cache, dist_stat_cache,
 		Option("gracedb-far-threshold", config.upload.gracedb_far_threshold),
 		Option("gracedb-group", config.upload.gracedb_group),
 		Option("gracedb-pipeline", config.upload.gracedb_pipeline),
-		Option("gracedb-search", config.upload.gracedb_search),
+		Option("gracedb-search", config.upload.inj_gracedb_search),
 		Option("gracedb-label", config.upload.gracedb_label),
 		Option("gracedb-service-url", config.upload.inj_gracedb_service_url),
 		Option("far-trials-factor", config.upload.far_trials_factor),
@@ -1965,8 +1965,10 @@ def upload_events_layer(config, dag):
 		# add gracedb service url
 		if "inj_" in input_topic:
 			arguments.append(Option("gracedb-service-url", config.upload.inj_gracedb_service_url))
+			arguments.append(Option("gracedb-search", config.upload.inj_gracedb_search))
 		else:
 			arguments.append(Option("gracedb-service-url", config.upload.gracedb_service_url))
+			arguments.append(Option("gracedb-search",config.upload.gracedb_search))
 
 		layer += Node(arguments = arguments)
 
@@ -2085,8 +2087,10 @@ def upload_pastro_layer(config, dag, marg_pdf_cache):
 			# add gracedb service url
 			if "inj_" in input_topic:
 				arguments.append(Option("gracedb-service-url", config.upload.inj_gracedb_service_url))
+				arguments.append(Option("gracedb-search", config.upload.inj_gracedb_search))
 			else:
 				arguments.append(Option("gracedb-service-url", config.upload.gracedb_service_url))
+				arguments.append(Option("gracedb-search", config.upload.gracedb_search))
 
 			layer += Node(arguments = arguments)
 
@@ -2128,8 +2132,10 @@ def plot_events_layer(config, dag):
 			# add gracedb service url
 			if "inj_" in upload_topic:
 				arguments.append(Option("gracedb-service-url", config.upload.inj_gracedb_service_url))
+				arguments.append(Option("gracedb-search", config.upload.inj_gracedb_search))
 			else:
 				arguments.append(Option("gracedb-service-url", config.upload.gracedb_service_url))
+				arguments.append(Option("gracedb-search", config.upload.gracedb_search))
 
 			layer += Node(arguments = arguments)