diff --git a/bin/darkfid2/src/main.rs b/bin/darkfid2/src/main.rs
index 99ec0c329..04d663e40 100644
--- a/bin/darkfid2/src/main.rs
+++ b/bin/darkfid2/src/main.rs
@@ -472,7 +472,7 @@ async fn realmain(args: Args, ex: Arc<Executor<'_>>) -> Result<()> {
             //.register(net::SESSION_ALL, move |channel, p2p| {
             .register(!net::SESSION_SEED, move |channel, p2p| {
                 let state = _state.clone();
-                async move { ProtocolSync::init(channel, state, p2p).await.unwrap() }
+                async move { ProtocolSync::init(channel, state, p2p, args.consensus).await.unwrap() }
             })
             .await;
 
diff --git a/src/consensus2/proto/protocol_sync.rs b/src/consensus2/proto/protocol_sync.rs
index aa4833248..7f03cba0b 100644
--- a/src/consensus2/proto/protocol_sync.rs
+++ b/src/consensus2/proto/protocol_sync.rs
@@ -25,6 +25,7 @@ pub struct ProtocolSync {
     jobsman: ProtocolJobsManagerPtr,
     state: ValidatorStatePtr,
     p2p: P2pPtr,
+    consensus_mode: bool,
 }
 
 impl ProtocolSync {
@@ -32,6 +33,7 @@ impl ProtocolSync {
         channel: ChannelPtr,
         state: ValidatorStatePtr,
         p2p: P2pPtr,
+        consensus_mode: bool,
     ) -> Result<ProtocolBasePtr> {
         let msg_subsystem = channel.get_message_subsystem();
         msg_subsystem.add_dispatch::<BlockOrder>().await;
@@ -47,6 +49,7 @@ impl ProtocolSync {
             jobsman: ProtocolJobsManager::new("SyncProtocol", channel),
             state,
             p2p,
+            consensus_mode,
         }))
     }
 
@@ -75,17 +78,18 @@ impl ProtocolSync {
 
             debug!("ProtocolSync::handle_receive_block() received block");
 
-            // TODO: The following code should be executed only by replicators, not
-            // consensus nodes.
-
             // Node stores finalized flock, if it doesn't exist (checking by slot),
             // and removes its transactions from the unconfirmed_txs vector.
+            // Consensus-mode enabled nodes have already performed these steps,
+            // during proposal finalization.
             // Extra validations can be added here.
-            let info_copy = (*info).clone();
-            if !self.state.read().await.blockchain.has_block(&info_copy)? {
-                self.state.write().await.blockchain.add(&[info_copy.clone()])?;
-                self.state.write().await.remove_txs(info_copy.txs.clone())?;
-                self.p2p.broadcast(info_copy).await?;
+            if !self.consensus_mode {
+                let info_copy = (*info).clone();
+                if !self.state.read().await.blockchain.has_block(&info_copy)? {
+                    self.state.write().await.blockchain.add(&[info_copy.clone()])?;
+                    self.state.write().await.remove_txs(info_copy.txs.clone())?;
+                    self.p2p.broadcast(info_copy).await?;
+                }
             }
         }
     }