diff --git a/lib/archethic/transaction_chain/transaction/validation_stamp/ledger_operations/transaction_movement.ex b/lib/archethic/transaction_chain/transaction/validation_stamp/ledger_operations/transaction_movement.ex
index b5acbc6b4..806731d3c 100644
--- a/lib/archethic/transaction_chain/transaction/validation_stamp/ledger_operations/transaction_movement.ex
+++ b/lib/archethic/transaction_chain/transaction/validation_stamp/ledger_operations/transaction_movement.ex
@@ -129,11 +129,11 @@ defmodule ArchEthic.TransactionChain.Transaction.ValidationStamp.LedgerOperation
     }
 
     case Map.get(movement, :type) do
-      type when type in [:UCO, "UCO"] ->
+      :UCO ->
         %{res | type: :UCO}
 
-      type when type in [:NFT, "NFT"] ->
-        %{res | type: {:NFT, Map.get(movement, :nft_address)}}
+      {:NFT, nft_address} ->
+        %{res | type: {:NFT, nft_address}}
     end
   end