diff --git a/lbrynet/extras/wallet/manager.py b/lbrynet/extras/wallet/manager.py
index b6bc91f1b..4b2e1b474 100644
--- a/lbrynet/extras/wallet/manager.py
+++ b/lbrynet/extras/wallet/manager.py
@@ -4,7 +4,6 @@ import asyncio
 import logging
 from binascii import unhexlify
 
-from aiorpcx.jsonrpc import CodeMessageError
 from datetime import datetime
 from typing import Optional
 
@@ -12,6 +11,7 @@ from twisted.internet import defer
 
 from lbrynet.schema.schema import SECP256k1
 from torba.client.basemanager import BaseWalletManager
+from torba.rpc.jsonrpc import CodeMessageError
 
 from lbrynet.schema.claim import ClaimDict
 
diff --git a/lbrynet/extras/wallet/server/daemon.py b/lbrynet/extras/wallet/server/daemon.py
index bdb1ab4df..2dc8c370e 100644
--- a/lbrynet/extras/wallet/server/daemon.py
+++ b/lbrynet/extras/wallet/server/daemon.py
@@ -1,6 +1,6 @@
-from aiorpcx import RPCError
 from functools import wraps
 
+from torba.rpc.jsonrpc import RPCError
 from torba.server.daemon import Daemon, DaemonError
 
 
diff --git a/lbrynet/extras/wallet/server/session.py b/lbrynet/extras/wallet/server/session.py
index 50313da7e..91521ef90 100644
--- a/lbrynet/extras/wallet/server/session.py
+++ b/lbrynet/extras/wallet/server/session.py
@@ -1,7 +1,7 @@
 import math
 from binascii import unhexlify, hexlify
 
-from aiorpcx import RPCError
+from torba.rpc.jsonrpc import RPCError
 from torba.server.hash import hash_to_hex_str
 from torba.server.session import ElectrumX
 from torba.server import util