diff --git a/collector/src/bin/collector.rs b/collector/src/bin/collector.rs
index 93ba85cac..c3937d213 100644
--- a/collector/src/bin/collector.rs
+++ b/collector/src/bin/collector.rs
@@ -1389,7 +1389,9 @@ Make sure to modify `{dir}/perf-config.json` if the category/artifact don't matc
             let collector_config = rt
                 .block_on(conn.start_collector(&collector_name, &git_sha))?
                 .ok_or_else(|| {
-                    anyhow::anyhow!("Collector with name `{collector_name}` not found")
+                    anyhow::anyhow!(
+                        "No active collector with the name `{collector_name}` not found"
+                    )
                 })?;
 
             if collector_config.target().as_str() != host_target_tuple {
diff --git a/database/src/pool/postgres.rs b/database/src/pool/postgres.rs
index c5b15092f..0be955e88 100644
--- a/database/src/pool/postgres.rs
+++ b/database/src/pool/postgres.rs
@@ -1816,7 +1816,8 @@ where
                     last_heartbeat_at = NOW(),
                     commit_sha = $2
                 WHERE
-                    name = $1
+                    name = $1 AND
+                    is_active = true
                 RETURNING
                     target,
                     benchmark_set,