diff --git a/zebrad/src/components/sync.rs b/zebrad/src/components/sync.rs
index 43b8f521..6c06ad82 100644
--- a/zebrad/src/components/sync.rs
+++ b/zebrad/src/components/sync.rs
@@ -506,7 +506,7 @@ where
         // So we just download and verify the genesis block here.
         while !self.state_contains(self.genesis_hash).await? {
             self.downloads
-                .queue_download(self.genesis_hash)
+                .download_and_verify(self.genesis_hash)
                 .await
                 .map_err(|e| eyre!(e))?;
             match self.downloads.next().await.expect("downloads is nonempty") {
@@ -531,7 +531,7 @@ where
             }
 
             self.downloads
-                .queue_download(hash)
+                .download_and_verify(hash)
                 .await
                 .map_err(|e| eyre!(e))?;
         }
diff --git a/zebrad/src/components/sync/downloads.rs b/zebrad/src/components/sync/downloads.rs
index fe1be13b..fe5b983c 100644
--- a/zebrad/src/components/sync/downloads.rs
+++ b/zebrad/src/components/sync/downloads.rs
@@ -110,7 +110,7 @@ where
     /// only if the network service fails. It returns immediately after queuing
     /// the request.
     #[instrument(skip(self))]
-    pub async fn queue_download(&mut self, hash: block::Hash) -> Result<(), BoxError> {
+    pub async fn download_and_verify(&mut self, hash: block::Hash) -> Result<(), BoxError> {
         if self.cancel_handles.contains_key(&hash) {
             tracing::debug!("skipping hash already queued for download");
             return Ok(());
@@ -134,7 +134,6 @@ where
         // This oneshot is used to signal cancellation to the download task.
         let (cancel_tx, mut cancel_rx) = oneshot::channel::<()>();
 
-        let span = tracing::warn_span!("block_fetch_verify", ?hash);
         let mut verifier = self.verifier.clone();
         let task = tokio::spawn(
             async move {
@@ -170,7 +169,7 @@ where
 
                 verification
             }
-            .instrument(span)
+            .in_current_span()
             // Tack the hash onto the error so we can remove the cancel handle
             // on failure as well as on success.
             .map_err(move |e| (e, hash)),