diff --git a/zebrad/src/commands/start.rs b/zebrad/src/commands/start.rs
index 4e0f71b7ff1..e401971113e 100644
--- a/zebrad/src/commands/start.rs
+++ b/zebrad/src/commands/start.rs
@@ -288,14 +288,14 @@ impl StartCmd {
         info!("spawning syncer task");
         let syncer_task_handle = tokio::spawn(syncer.sync().in_current_span());
 
-        #[cfg(feature = "zebra-scan")]
+        #[cfg(feature = "shielded-scan")]
         // Spawn never ending scan task.
         let scan_task_handle = {
             info!("spawning shielded scanner with configured viewing keys");
             zebra_scan::spawn_init(&config.shielded_scan, config.network.network, state)
         };
 
-        #[cfg(not(feature = "zebra-scan"))]
+        #[cfg(not(feature = "shielded-scan"))]
         // Spawn a dummy scan task which doesn't do anything and never finishes.
         let scan_task_handle: tokio::task::JoinHandle<Result<(), Report>> =
             tokio::spawn(std::future::pending().in_current_span());
diff --git a/zebrad/src/config.rs b/zebrad/src/config.rs
index b6e0af2778c..a12e6362c84 100644
--- a/zebrad/src/config.rs
+++ b/zebrad/src/config.rs
@@ -44,7 +44,7 @@ pub struct ZebradConfig {
     /// Mining configuration
     pub mining: zebra_rpc::config::mining::Config,
 
-    #[cfg(feature = "zebra-scan")]
+    #[cfg(feature = "shielded-scan")]
     /// Scanner configuration
     pub shielded_scan: zebra_scan::config::Config,
 }
diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs
index fc117dd14e9..afab3631775 100644
--- a/zebrad/tests/acceptance.rs
+++ b/zebrad/tests/acceptance.rs
@@ -2805,7 +2805,7 @@ async fn fully_synced_rpc_z_getsubtreesbyindex_snapshot_test() -> Result<()> {
 }
 
 /// Test that the scanner task gets started when the node starts.
-#[cfg(feature = "zebra-scan")]
+#[cfg(feature = "shielded-scan")]
 #[test]
 fn scan_task_starts() -> Result<()> {
     use indexmap::IndexMap;