diff --git a/crates/papyrus_p2p_sync/Cargo.toml b/crates/papyrus_p2p_sync/Cargo.toml
index 456bbd2108..653fbd259b 100644
--- a/crates/papyrus_p2p_sync/Cargo.toml
+++ b/crates/papyrus_p2p_sync/Cargo.toml
@@ -42,3 +42,6 @@ tokio = { workspace = true, features = ["test-util"] }
 # The `metrics` crate is used by `latency_histogram` proc macro, which is used in this crate.
 [package.metadata.cargo-machete]
 ignored = ["metrics"]
+
+[lints]
+workspace = true
diff --git a/crates/papyrus_p2p_sync/src/server/utils.rs b/crates/papyrus_p2p_sync/src/server/utils.rs
index 6e91ea43c3..528fec6238 100644
--- a/crates/papyrus_p2p_sync/src/server/utils.rs
+++ b/crates/papyrus_p2p_sync/src/server/utils.rs
@@ -12,13 +12,11 @@ pub(crate) fn calculate_block_number(
         Direction::Backward => -1,
     };
     // TODO(shahak): Fix this code.
-    let blocks_delta: i128 = direction_factor * (query.step * read_blocks_counter) as i128;
-    let block_number: i128 = start_block as i128 + blocks_delta;
-    if block_number < 0 || block_number > u64::MAX as i128 {
-        return Err(P2PSyncServerError::BlockNumberOutOfRange {
-            query: query.clone(),
-            counter: read_blocks_counter,
-        });
-    }
-    Ok(block_number as u64)
+    let blocks_delta: i128 = direction_factor * i128::from(query.step * read_blocks_counter);
+    let block_number: i128 = i128::from(start_block) + blocks_delta;
+
+    u64::try_from(block_number).map_err(|_| P2PSyncServerError::BlockNumberOutOfRange {
+        query: query.clone(),
+        counter: read_blocks_counter,
+    })
 }