diff --git a/cmd/service/router.go b/cmd/service/router.go
index ab7f40f..200dacc 100644
--- a/cmd/service/router.go
+++ b/cmd/service/router.go
@@ -26,7 +26,7 @@ func bootstrapEventRouter(cacheProvider cache.Cache, pubCB router.Callback) *rou
 	router.RegisterLogRoute(w3.H("0x894e56e1dac400b4475c83d8af0f0aa44de17c62764bd82f6e768a504e242461"), handler.HandleCustodialRegistrationLog())
 	router.RegisterLogRoute(w3.H("0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"), handler.HandleTokenTransferLog(handlerContainer))
 	router.RegisterLogRoute(w3.H("0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925"), handler.HandleTokenApproveLog(handlerContainer))
-	router.RegisterLogRoute(w3.H("0x2a41fa80e3e54181fc83d8e79d9cbbe49b1884bf79a3bf54f9d605d88eacb67e"), handler.HandleTokenTransferFromLog(handlerContainer))
+	router.RegisterLogRoute(w3.H("0x5f7542858008eeb041631f30e6109ae94b83a58e9a58261dd2c42c508850f939"), handler.HandleTokenTransferFromLog(handlerContainer))
 
 	router.RegisterInputDataRoute("63e4bff4", handler.HandleFaucetGiveInputData())
 	router.RegisterInputDataRoute("de82efb4", handler.HandleFaucetGiveInputData())
diff --git a/internal/handler/token_transfer.go b/internal/handler/token_transfer.go
index 3e41820..35266a6 100644
--- a/internal/handler/token_transfer.go
+++ b/internal/handler/token_transfer.go
@@ -14,9 +14,10 @@ const transferEventName = "TOKEN_TRANSFER"
 
 var (
 	tokenTransferEvent     = w3.MustNewEvent("Transfer(address indexed _from, address indexed _to, uint256 _value)")
-	tokenTransferSig       = w3.MustNewFunc("transfer(address, uint256)", "bool")
-	tokenTransferFromSig   = w3.MustNewFunc("transferFrom(address, address, uint256)", "bool")
 	tokenTransferFromEvent = w3.MustNewEvent("TransferFrom(address indexed _from, address indexed _to, address indexed _spender, uint256 _value)")
+
+	tokenTransferSig     = w3.MustNewFunc("transfer(address, uint256)", "bool")
+	tokenTransferFromSig = w3.MustNewFunc("transferFrom(address, address, uint256)", "bool")
 )
 
 func HandleTokenTransferLog(hc *HandlerContainer) router.LogHandlerFunc {
@@ -140,7 +141,6 @@ func HandleTokenTransferFromLog(hc *HandlerContainer) router.LogHandlerFunc {
 			return err
 		}
 
-		// TODO: Check correct params
 		proceed, err := hc.checkWithinNetwork(ctx, lp.Log.Address.Hex(), from.Hex(), to.Hex())
 		if err != nil {
 			return err
@@ -156,7 +156,7 @@ func HandleTokenTransferFromLog(hc *HandlerContainer) router.LogHandlerFunc {
 			Success:         true,
 			Timestamp:       lp.Timestamp,
 			TxHash:          lp.Log.TxHash.Hex(),
-			TxType:          "TOKEN_TRANSFER_FROM",
+			TxType:          transferEventName,
 			Payload: map[string]any{
 				"from":    from.Hex(),
 				"to":      to.Hex(),