diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py
index 7508c1b5e..43b702162 100644
--- a/lbry/extras/daemon/daemon.py
+++ b/lbry/extras/daemon/daemon.py
@@ -2571,9 +2571,9 @@ class Daemon(metaclass=JSONRPCServerType):
             account.add_channel_private_key(txo.private_key)
             wallet.save()
             await self.broadcast_or_release(tx, blocking)
-            await self.storage.save_claims([self._old_get_temp_claim_info(
+            self.component_manager.loop.create_task(self.storage.save_claims([self._old_get_temp_claim_info(
                 tx, txo, claim_address, claim, name, dewies_to_lbc(amount)
-            )])
+            )]))
             self.component_manager.loop.create_task(self.analytics_manager.send_new_channel())
         else:
             await account.ledger.release_tx(tx)
@@ -2727,9 +2727,9 @@ class Daemon(metaclass=JSONRPCServerType):
             account.add_channel_private_key(new_txo.private_key)
             wallet.save()
             await self.broadcast_or_release(tx, blocking)
-            await self.storage.save_claims([self._old_get_temp_claim_info(
+            self.component_manager.loop.create_task(self.storage.save_claims([self._old_get_temp_claim_info(
                 tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount)
-            )])
+            )]))
             self.component_manager.loop.create_task(self.analytics_manager.send_new_channel())
         else:
             await account.ledger.release_tx(tx)
@@ -3264,10 +3264,14 @@ class Daemon(metaclass=JSONRPCServerType):
 
         if not preview:
             await self.broadcast_or_release(tx, blocking)
-            await self.storage.save_claims([self._old_get_temp_claim_info(
-                tx, new_txo, claim_address, claim, name, dewies_to_lbc(amount)
-            )])
-            await self.storage.save_content_claim(file_stream.stream_hash, new_txo.id)
+
+            async def save_claims():
+                await self.storage.save_claims([self._old_get_temp_claim_info(
+                    tx, new_txo, claim_address, claim, name, dewies_to_lbc(amount)
+                )])
+                await self.storage.save_content_claim(file_stream.stream_hash, new_txo.id)
+
+            self.component_manager.loop.create_task(save_claims())
             self.component_manager.loop.create_task(self.analytics_manager.send_claim_action('publish'))
         else:
             await account.ledger.release_tx(tx)
@@ -3482,11 +3486,15 @@ class Daemon(metaclass=JSONRPCServerType):
 
         if not preview:
             await self.broadcast_or_release(tx, blocking)
-            await self.storage.save_claims([self._old_get_temp_claim_info(
-                tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount)
-            )])
-            if stream_hash:
-                await self.storage.save_content_claim(stream_hash, new_txo.id)
+
+            async def save_claims():
+                await self.storage.save_claims([self._old_get_temp_claim_info(
+                    tx, new_txo, claim_address, new_txo.claim, new_txo.claim_name, dewies_to_lbc(amount)
+                )])
+                if stream_hash:
+                    await self.storage.save_content_claim(stream_hash, new_txo.id)
+
+            self.component_manager.loop.create_task(save_claims())
             self.component_manager.loop.create_task(self.analytics_manager.send_claim_action('publish'))
         else:
             await account.ledger.release_tx(tx)
diff --git a/lbry/wallet/network.py b/lbry/wallet/network.py
index 94ffd5e4f..92793e9ca 100644
--- a/lbry/wallet/network.py
+++ b/lbry/wallet/network.py
@@ -149,7 +149,6 @@ class ClientSession(BaseClientSession):
         self.response_time = None
         self.connection_latency = None
         self._response_samples = 0
-        self.pending_amount = 0
         self._on_disconnect_controller.add(True)
 
 
@@ -285,12 +284,13 @@ class Network:
 
     async def subscribe_address(self, address, *addresses):
         addresses = list((address, ) + addresses)
+        server_addr_and_port = self.client.server_address_and_port  # on disconnect client will be None
         try:
             return await self.rpc('blockchain.address.subscribe', addresses, True)
         except asyncio.TimeoutError:
             log.warning(
                 "timed out subscribing to addresses from %s:%i",
-                *self.client.server_address_and_port
+                *server_addr_and_port
             )
             # abort and cancel, we can't lose a subscription, it will happen again on reconnect
             if self.client: