diff --git a/lib/archethic/transaction_chain.ex b/lib/archethic/transaction_chain.ex
index 44d214475..066581a74 100644
--- a/lib/archethic/transaction_chain.ex
+++ b/lib/archethic/transaction_chain.ex
@@ -398,7 +398,7 @@ defmodule Archethic.TransactionChain do
           nil ->
             {[], {paging_address, true, false}}
 
-          _ ->
+          %Transaction{address: next_paging_address} ->
             {transactions, {next_paging_address, true, false}}
         end
       end
diff --git a/test/archethic/transaction_chain_test.exs b/test/archethic/transaction_chain_test.exs
index 744a60558..0ae58f74b 100644
--- a/test/archethic/transaction_chain_test.exs
+++ b/test/archethic/transaction_chain_test.exs
@@ -355,19 +355,15 @@ defmodule Archethic.TransactionChainTest do
       end)
 
       MockClient
-      |> stub(:send_message, fn
-        _, %GetTransactionChain{address: _}, _ ->
-          {:ok,
-           %TransactionList{
-             transactions: [
-               %Transaction{address: "Alice2"}
-             ]
-           }}
-      end)
+      |> expect(
+        :send_message,
+        fn _, %GetTransactionChain{address: _, paging_state: "Alice1"}, _ ->
+          {:ok, %TransactionList{transactions: [%Transaction{address: "Alice2"}]}}
+        end
+      )
 
       assert ["Alice1", "Alice2"] =
-               TransactionChain.fetch("Alice2", nodes)
-               |> Enum.map(& &1.address)
+               TransactionChain.fetch("Alice2", nodes) |> Enum.map(& &1.address)
     end
 
     test "should resolve the longest chain" do