diff --git a/lbrynet/extras/wallet/manager.py b/lbrynet/extras/wallet/manager.py
index f4b35c65d..b0a73e828 100644
--- a/lbrynet/extras/wallet/manager.py
+++ b/lbrynet/extras/wallet/manager.py
@@ -281,8 +281,9 @@ class LbryWalletManager(BaseWalletManager):
     async def get_claims_for_name(self, name: str):
         response = await self.ledger.network.get_claims_for_name(name)
         if 'claims' in response:
-            to_resolve = [(claim['name'] + '#' + claim['claim_id']) for claim in response['claims']]
-            response['claims'] = [resolution['claim'] for resolution in (await self.resolve(*to_resolve)).values()]
+            resolutions = await self.resolve(*[f"{claim['name']}#{claim['claim_id']}" for claim in response['claims']])
+            resolutions = resolutions.values()
+            response['claims'] = [resolution.get('claim', resolution.get('certificate')) for resolution in resolutions]
         return response
 
     async def address_is_mine(self, unknown_address, account):