diff --git a/pkg/graphql/graphql.go b/pkg/graphql/graphql.go
index 9090194b..75a8b690 100644
--- a/pkg/graphql/graphql.go
+++ b/pkg/graphql/graphql.go
@@ -243,10 +243,7 @@ func (t *Transaction) From(ctx context.Context, args BlockNumberArgs) (*Account,
 	if err != nil || tx == nil {
 		return nil, err
 	}
-	var signer types.Signer = types.HomesteadSigner{}
-	if tx.Protected() {
-		signer = types.NewEIP155Signer(tx.ChainId())
-	}
+	signer := eth.SignerForTx(tx)
 	from, _ := types.Sender(signer, tx)
 
 	return &Account{