diff --git a/Sources/ZcashLightClientKit/Block/CompactBlockProcessor.swift b/Sources/ZcashLightClientKit/Block/CompactBlockProcessor.swift
index fc0cae61..7a66eeac 100644
--- a/Sources/ZcashLightClientKit/Block/CompactBlockProcessor.swift
+++ b/Sources/ZcashLightClientKit/Block/CompactBlockProcessor.swift
@@ -681,7 +681,6 @@ actor CompactBlockProcessor {
 
                 if let range = ranges.downloadAndScanRange {
                     logger.debug("Starting sync with range: \(range.lowerBound)...\(range.upperBound)")
-                    try await blockDownloader.setSyncRange(range)
                     try await downloadAndScanBlocks(at: range, totalProgressRange: totalProgressRange)
                 }
 
@@ -778,6 +777,7 @@ actor CompactBlockProcessor {
             try Task.checkCancellation()
 
             do {
+                try await blockDownloader.setSyncRange(range)
                 await blockDownloader.setDownloadLimit(processingRange.upperBound + (2 * batchSize))
                 await blockDownloader.startDownload(maxBlockBufferSize: config.downloadBufferSize)
 
diff --git a/Sources/ZcashLightClientKit/Block/Download/BlockDownloader.swift b/Sources/ZcashLightClientKit/Block/Download/BlockDownloader.swift
index 6699373e..b37cb6aa 100644
--- a/Sources/ZcashLightClientKit/Block/Download/BlockDownloader.swift
+++ b/Sources/ZcashLightClientKit/Block/Download/BlockDownloader.swift
@@ -62,7 +62,7 @@ actor BlockDownloaderImpl {
     let metrics: SDKMetrics
     let logger: Logger
 
-    private var downloadStream: BlockDownloaderStream?
+//    private var downloadStream: BlockDownloaderStream?
     private var syncRange: CompactBlockRange?
 
     private var downloadToHeight: BlockHeight = 0
@@ -89,7 +89,7 @@ actor BlockDownloaderImpl {
     private func doDownload(maxBlockBufferSize: Int) async {
         lastError = nil
         do {
-            guard let downloadStream = self.downloadStream, let syncRange = self.syncRange else {
+            guard /*let downloadStream = self.downloadStream,*/ let syncRange = self.syncRange else {
                 logger.error("Dont have downloadStream. Trying to download blocks before sync range is not set.")
                 throw ZcashError.blockDownloadSyncRangeNotSet
             }
@@ -110,6 +110,8 @@ actor BlockDownloaderImpl {
 
             let range = downloadFrom...downloadTo
 
+            let downloadStream = try await compactBlocksDownloadStream(startHeight: range.lowerBound, targetHeight: range.upperBound)
+
             logger.debug("""
             Starting downloading blocks.
             syncRange:                   \(syncRange.lowerBound)...\(syncRange.upperBound)
@@ -224,7 +226,7 @@ extension BlockDownloaderImpl: BlockDownloader {
     }
 
     func setSyncRange(_ range: CompactBlockRange) async throws {
-        downloadStream = try await compactBlocksDownloadStream(startHeight: range.lowerBound, targetHeight: range.upperBound)
+//        downloadStream = try await compactBlocksDownloadStream(startHeight: range.lowerBound, targetHeight: range.upperBound)
         syncRange = range
     }