diff --git a/lib/archethic/replication.ex b/lib/archethic/replication.ex
index 81748fa73..6837974d9 100644
--- a/lib/archethic/replication.ex
+++ b/lib/archethic/replication.ex
@@ -90,8 +90,6 @@ defmodule Archethic.Replication do
              Enum.to_list(inputs)
            ) do
         :ok ->
-          # Store the previous and the new one, as being the reference for next transactions 
-          :ok = TransactionChain.write(Enum.filter([previous_tx, tx], & &1))
           :ok = ingest_transaction(tx)
           PubSub.notify_new_transaction(address, type, timestamp)
 
@@ -108,17 +106,22 @@ defmodule Archethic.Replication do
             %{role: :chain}
           )
 
-          if previous_tx do
-            # Load the rest of the chain asynchronously
-            Task.start(fn ->
-              # Stream the insertion of the chain
-              previous_tx
-              |> stream_previous_chain()
-              |> Stream.reject(&Enum.empty?/1)
-              |> Stream.each(&TransactionChain.write/1)
-              |> Stream.run()
-            end)
-          end
+          # Stream the insertion of the chain
+          tx
+          |> stream_previous_chain()
+          |> Stream.reject(&Enum.empty?/1)
+          |> Stream.each(&TransactionChain.write/1)
+          |> Stream.run()
+
+          TransactionChain.write_transaction(tx)
+
+          :telemetry.execute(
+            [:archethic, :replication, :full_write],
+            %{
+              duration: System.monotonic_time() - start_time
+            },
+            %{role: :chain}
+          )
 
           :ok
 
diff --git a/lib/archethic/telemetry.ex b/lib/archethic/telemetry.ex
index 74fe72b6a..ac58b28da 100644
--- a/lib/archethic/telemetry.ex
+++ b/lib/archethic/telemetry.ex
@@ -103,7 +103,12 @@ defmodule Archethic.Telemetry do
       ),
       distribution("archethic.replication.validation.duration",
         unit: {:native, :second},
-        reporter_options: [buckets: [0.01, 0.025, 0.05, 0.1, 0.3, 0.5, 0.8, 1, 1.5]],
+        reporter_options: [buckets: [0.01, 0.025, 0.05, 0.1, 0.3, 0.5, 0.8, 1, 1.5, 2, 3]],
+        measurement: :duration
+      ),
+      distribution("archethic.replication.validation.full_write",
+        unit: {:native, :second},
+        reporter_options: [buckets: [0.01, 0.025, 0.05, 0.1, 0.3, 0.5, 0.8, 1, 1.5, 3, 5, 10]],
         measurement: :duration
       ),
       distribution("archethic.db.duration",
diff --git a/test/archethic/bootstrap/network_init_test.exs b/test/archethic/bootstrap/network_init_test.exs
index f31cfdac1..56877c4a0 100644
--- a/test/archethic/bootstrap/network_init_test.exs
+++ b/test/archethic/bootstrap/network_init_test.exs
@@ -212,7 +212,7 @@ defmodule Archethic.Bootstrap.NetworkInitTest do
     me = self()
 
     MockDB
-    |> stub(:write_transaction_chain, fn [^tx] ->
+    |> stub(:write_transaction, fn ^tx ->
       send(me, :write_transaction)
       :ok
     end)
@@ -261,7 +261,7 @@ defmodule Archethic.Bootstrap.NetworkInitTest do
     me = self()
 
     MockDB
-    |> expect(:write_transaction_chain, fn [tx] ->
+    |> expect(:write_transaction, fn tx ->
       send(me, {:transaction, tx})
       :ok
     end)
@@ -413,7 +413,7 @@ defmodule Archethic.Bootstrap.NetworkInitTest do
     me = self()
 
     MockDB
-    |> expect(:write_transaction_chain, fn [tx] ->
+    |> expect(:write_transaction, fn tx ->
       send(me, {:transaction, tx})
       :ok
     end)
diff --git a/test/archethic/replication_test.exs b/test/archethic/replication_test.exs
index 29c9841ff..76f8cb3d9 100644
--- a/test/archethic/replication_test.exs
+++ b/test/archethic/replication_test.exs
@@ -70,7 +70,11 @@ defmodule Archethic.ReplicationTest do
     tx = create_valid_transaction(unspent_outputs)
 
     MockDB
-    |> expect(:write_transaction_chain, fn [^tx] ->
+    # |> stub(:write_transaction_chain, fn [^tx] ->
+    #  send(me, :replicated)
+    #  :ok
+    # end)
+    |> expect(:write_transaction, fn ^tx ->
       send(me, :replicated)
       :ok
     end)
diff --git a/test/archethic/self_repair/sync/transaction_handler_test.exs b/test/archethic/self_repair/sync/transaction_handler_test.exs
index de37d3924..b6f8bc9dc 100644
--- a/test/archethic/self_repair/sync/transaction_handler_test.exs
+++ b/test/archethic/self_repair/sync/transaction_handler_test.exs
@@ -166,7 +166,7 @@ defmodule Archethic.SelfRepair.Sync.TransactionHandlerTest do
     end)
 
     MockDB
-    |> stub(:write_transaction_chain, fn [^tx] ->
+    |> stub(:write_transaction, fn ^tx ->
       send(me, :transaction_replicated)
       :ok
     end)
diff --git a/test/archethic/self_repair/sync_test.exs b/test/archethic/self_repair/sync_test.exs
index 32c804888..7b1a2c2d4 100644
--- a/test/archethic/self_repair/sync_test.exs
+++ b/test/archethic/self_repair/sync_test.exs
@@ -169,7 +169,7 @@ defmodule Archethic.SelfRepair.SyncTest do
       me = self()
 
       MockDB
-      |> stub(:write_transaction_chain, fn [^tx] ->
+      |> stub(:write_transaction, fn ^tx ->
         send(me, :storage)
         :ok
       end)
@@ -308,7 +308,7 @@ defmodule Archethic.SelfRepair.SyncTest do
       me = self()
 
       MockDB
-      |> stub(:write_transaction_chain, fn [^transfer_tx] ->
+      |> stub(:write_transaction, fn ^transfer_tx ->
         send(me, :transaction_stored)
         :ok
       end)